Re: svn commit: r299575 - head/sys/net80211

[Andriy Voskoboinyk]

Fri, 13 May 2016 02:56:56 +0300 було написано Adrian Chadd  
:


It works - but REFCNT_LOC macro is not used since r178354 (multi-vap  
support).



Wait a sec, I thought the DEBUG_REFCNT stuff worked?


-a


On 12 May 2016 at 15:17, Andriy Voskoboinyk  wrote:

Author: avos
Date: Thu May 12 22:17:00 2016
New Revision: 299575
URL: https://svnweb.freebsd.org/changeset/base/299575

Log:
  net80211: drop some unused variables / local macros

  Most of them left after some commits (r178354, r191544, r287197 etc.);
  some were never used.

  Found by: Clang Static Analyzer

Modified:
  head/sys/net80211/ieee80211_adhoc.c
  head/sys/net80211/ieee80211_hostap.c
  head/sys/net80211/ieee80211_hwmp.c
  head/sys/net80211/ieee80211_mesh.c
  head/sys/net80211/ieee80211_node.c
  head/sys/net80211/ieee80211_output.c
  head/sys/net80211/ieee80211_phy.c
  head/sys/net80211/ieee80211_scan_sw.c
  head/sys/net80211/ieee80211_sta.c
  head/sys/net80211/ieee80211_wds.c

Modified: head/sys/net80211/ieee80211_adhoc.c
==
--- head/sys/net80211/ieee80211_adhoc.c Thu May 12 22:13:12 2016 
(r299574)
+++ head/sys/net80211/ieee80211_adhoc.c Thu May 12 22:17:00 2016 
(r299575)

@@ -674,7 +674,7 @@ adhoc_recv_mgmt(struct ieee80211_node *n
struct ieee80211com *ic = ni->ni_ic;
struct ieee80211_channel *rxchan = ic->ic_curchan;
struct ieee80211_frame *wh;
-   uint8_t *frm, *efrm, *sfrm;
+   uint8_t *frm, *efrm;
uint8_t *ssid, *rates, *xrates;
 #if 0
int ht_state_change = 0;
@@ -809,7 +809,6 @@ adhoc_recv_mgmt(struct ieee80211_node *n
 *  [tlv] extended supported rates
 */
ssid = rates = xrates = NULL;
-   sfrm = frm;
while (efrm - frm > 1) {
IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2,  
return);

switch (*frm) {

Modified: head/sys/net80211/ieee80211_hostap.c
==
--- head/sys/net80211/ieee80211_hostap.cThu May 12 22:13:12  
2016(r299574)
+++ head/sys/net80211/ieee80211_hostap.cThu May 12 22:17:00  
2016(r299575)

@@ -412,16 +412,8 @@ hostap_deliver_data(struct ieee80211vap
ieee80211_free_node(sta);
}
}
-   if (mcopy != NULL) {
-   int len, err;
-   len = mcopy->m_pkthdr.len;
-   err = ieee80211_vap_xmitpkt(vap, mcopy);
-   if (err) {
-   /* NB: IFQ_HANDOFF reclaims mcopy */
-   } else {
-   if_inc_counter(ifp, IFCOUNTER_OPACKETS,  
1);

-   }
-   }
+   if (mcopy != NULL && ieee80211_vap_xmitpkt(vap, mcopy)  
== 0)

+   if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
}
if (m != NULL) {
/*
@@ -1798,7 +1790,6 @@ hostap_recv_mgmt(struct ieee80211_node *
 *  [tlv] extended supported rates
 */
ssid = rates = xrates = NULL;
-   sfrm = frm;
while (efrm - frm > 1) {
IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2,  
return);

switch (*frm) {

Modified: head/sys/net80211/ieee80211_hwmp.c
==
--- head/sys/net80211/ieee80211_hwmp.c  Thu May 12 22:13:12 2016 
(r299574)
+++ head/sys/net80211/ieee80211_hwmp.c  Thu May 12 22:17:00 2016 
(r299575)

@@ -128,7 +128,6 @@ typedef uint32_t ieee80211_hwmp_seq;
 #defineHWMP_SEQ_LEQ(a, b)  ((int32_t)((a)-(b)) <= 0)
 #defineHWMP_SEQ_EQ(a, b)   ((int32_t)((a)-(b)) == 0)
 #defineHWMP_SEQ_GT(a, b)   ((int32_t)((a)-(b)) > 0)
-#defineHWMP_SEQ_GEQ(a, b)  ((int32_t)((a)-(b)) >= 0)

 #define HWMP_SEQ_MAX(a, b) (a > b ? a : b)

@@ -1526,7 +1525,6 @@ hwmp_peerdown(struct ieee80211_node *ni)
 #definePERR_DADDR(n)   perr->perr_dests[n].dest_addr
 #definePERR_DSEQ(n)perr->perr_dests[n].dest_seq
 #definePERR_DEXTADDR(n) 
perr->perr_dests[n].dest_ext_addr

-#definePERR_DRCODE(n)  perr->perr_dests[n].dest_rcode
 static void
 hwmp_recv_perr(struct ieee80211vap *vap, struct ieee80211_node *ni,
 const struct ieee80211_frame *wh, const struct  
ieee80211_meshperr_ie *perr)

@@ -1628,7 +1626,6 @@ done:
 #undef PERR_DADDR
 #undef PERR_DSEQ
 #undef PERR_DEXTADDR
-#undef PERR_DRCODE

 static int
 hwmp_send_perr(struct ieee80211vap *vap,
@@ -1737,7 +1734,6 @@ hwmp_recv_rann(struct ieee80211vap *vap,
struct ieee80211_hwmp_route *hr;
struct 

Re: svn commit: r299575 - head/sys/net80211

[Adrian Chadd]

Wait a sec, I thought the DEBUG_REFCNT stuff worked?


-a


On 12 May 2016 at 15:17, Andriy Voskoboinyk  wrote:
> Author: avos
> Date: Thu May 12 22:17:00 2016
> New Revision: 299575
> URL: https://svnweb.freebsd.org/changeset/base/299575
>
> Log:
>   net80211: drop some unused variables / local macros
>
>   Most of them left after some commits (r178354, r191544, r287197 etc.);
>   some were never used.
>
>   Found by: Clang Static Analyzer
>
> Modified:
>   head/sys/net80211/ieee80211_adhoc.c
>   head/sys/net80211/ieee80211_hostap.c
>   head/sys/net80211/ieee80211_hwmp.c
>   head/sys/net80211/ieee80211_mesh.c
>   head/sys/net80211/ieee80211_node.c
>   head/sys/net80211/ieee80211_output.c
>   head/sys/net80211/ieee80211_phy.c
>   head/sys/net80211/ieee80211_scan_sw.c
>   head/sys/net80211/ieee80211_sta.c
>   head/sys/net80211/ieee80211_wds.c
>
> Modified: head/sys/net80211/ieee80211_adhoc.c
> ==
> --- head/sys/net80211/ieee80211_adhoc.c Thu May 12 22:13:12 2016
> (r299574)
> +++ head/sys/net80211/ieee80211_adhoc.c Thu May 12 22:17:00 2016
> (r299575)
> @@ -674,7 +674,7 @@ adhoc_recv_mgmt(struct ieee80211_node *n
> struct ieee80211com *ic = ni->ni_ic;
> struct ieee80211_channel *rxchan = ic->ic_curchan;
> struct ieee80211_frame *wh;
> -   uint8_t *frm, *efrm, *sfrm;
> +   uint8_t *frm, *efrm;
> uint8_t *ssid, *rates, *xrates;
>  #if 0
> int ht_state_change = 0;
> @@ -809,7 +809,6 @@ adhoc_recv_mgmt(struct ieee80211_node *n
>  *  [tlv] extended supported rates
>  */
> ssid = rates = xrates = NULL;
> -   sfrm = frm;
> while (efrm - frm > 1) {
> IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, 
> return);
> switch (*frm) {
>
> Modified: head/sys/net80211/ieee80211_hostap.c
> ==
> --- head/sys/net80211/ieee80211_hostap.cThu May 12 22:13:12 2016  
>   (r299574)
> +++ head/sys/net80211/ieee80211_hostap.cThu May 12 22:17:00 2016  
>   (r299575)
> @@ -412,16 +412,8 @@ hostap_deliver_data(struct ieee80211vap
> ieee80211_free_node(sta);
> }
> }
> -   if (mcopy != NULL) {
> -   int len, err;
> -   len = mcopy->m_pkthdr.len;
> -   err = ieee80211_vap_xmitpkt(vap, mcopy);
> -   if (err) {
> -   /* NB: IFQ_HANDOFF reclaims mcopy */
> -   } else {
> -   if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
> -   }
> -   }
> +   if (mcopy != NULL && ieee80211_vap_xmitpkt(vap, mcopy) == 0)
> +   if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
> }
> if (m != NULL) {
> /*
> @@ -1798,7 +1790,6 @@ hostap_recv_mgmt(struct ieee80211_node *
>  *  [tlv] extended supported rates
>  */
> ssid = rates = xrates = NULL;
> -   sfrm = frm;
> while (efrm - frm > 1) {
> IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, 
> return);
> switch (*frm) {
>
> Modified: head/sys/net80211/ieee80211_hwmp.c
> ==
> --- head/sys/net80211/ieee80211_hwmp.c  Thu May 12 22:13:12 2016
> (r299574)
> +++ head/sys/net80211/ieee80211_hwmp.c  Thu May 12 22:17:00 2016
> (r299575)
> @@ -128,7 +128,6 @@ typedef uint32_t ieee80211_hwmp_seq;
>  #defineHWMP_SEQ_LEQ(a, b)  ((int32_t)((a)-(b)) <= 0)
>  #defineHWMP_SEQ_EQ(a, b)   ((int32_t)((a)-(b)) == 0)
>  #defineHWMP_SEQ_GT(a, b)   ((int32_t)((a)-(b)) > 0)
> -#defineHWMP_SEQ_GEQ(a, b)  ((int32_t)((a)-(b)) >= 0)
>
>  #define HWMP_SEQ_MAX(a, b) (a > b ? a : b)
>
> @@ -1526,7 +1525,6 @@ hwmp_peerdown(struct ieee80211_node *ni)
>  #definePERR_DADDR(n)   perr->perr_dests[n].dest_addr
>  #definePERR_DSEQ(n)perr->perr_dests[n].dest_seq
>  #definePERR_DEXTADDR(n)perr->perr_dests[n].dest_ext_addr
> -#definePERR_DRCODE(n)  perr->perr_dests[n].dest_rcode
>  static void
>  hwmp_recv_perr(struct ieee80211vap *vap, struct ieee80211_node *ni,
>  const struct ieee80211_frame *wh, const struct ieee80211_meshperr_ie 
> *perr)
> @@ -1628,7 +1626,6 @@ done:
>  #undef PERR_DADDR
>  #undef PERR_DSEQ
>  #undef PERR_DEXTADDR
> -#undef PERR_DRCODE
>
>  static int
>  hwmp_send_perr(struct ieee80211vap *vap,
> @@ -1737,7 +1734,6 @@ hwmp_recv_rann(struct ieee80211vap *vap,
> struct ieee80211_hwmp_route 

svn commit: r299575 - head/sys/net80211

[Andriy Voskoboinyk]

Author: avos
Date: Thu May 12 22:17:00 2016
New Revision: 299575
URL: https://svnweb.freebsd.org/changeset/base/299575

Log:
  net80211: drop some unused variables / local macros
  
  Most of them left after some commits (r178354, r191544, r287197 etc.);
  some were never used.
  
  Found by: Clang Static Analyzer

Modified:
  head/sys/net80211/ieee80211_adhoc.c
  head/sys/net80211/ieee80211_hostap.c
  head/sys/net80211/ieee80211_hwmp.c
  head/sys/net80211/ieee80211_mesh.c
  head/sys/net80211/ieee80211_node.c
  head/sys/net80211/ieee80211_output.c
  head/sys/net80211/ieee80211_phy.c
  head/sys/net80211/ieee80211_scan_sw.c
  head/sys/net80211/ieee80211_sta.c
  head/sys/net80211/ieee80211_wds.c

Modified: head/sys/net80211/ieee80211_adhoc.c
==
--- head/sys/net80211/ieee80211_adhoc.c Thu May 12 22:13:12 2016
(r299574)
+++ head/sys/net80211/ieee80211_adhoc.c Thu May 12 22:17:00 2016
(r299575)
@@ -674,7 +674,7 @@ adhoc_recv_mgmt(struct ieee80211_node *n
struct ieee80211com *ic = ni->ni_ic;
struct ieee80211_channel *rxchan = ic->ic_curchan;
struct ieee80211_frame *wh;
-   uint8_t *frm, *efrm, *sfrm;
+   uint8_t *frm, *efrm;
uint8_t *ssid, *rates, *xrates;
 #if 0
int ht_state_change = 0;
@@ -809,7 +809,6 @@ adhoc_recv_mgmt(struct ieee80211_node *n
 *  [tlv] extended supported rates
 */
ssid = rates = xrates = NULL;
-   sfrm = frm;
while (efrm - frm > 1) {
IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
switch (*frm) {

Modified: head/sys/net80211/ieee80211_hostap.c
==
--- head/sys/net80211/ieee80211_hostap.cThu May 12 22:13:12 2016
(r299574)
+++ head/sys/net80211/ieee80211_hostap.cThu May 12 22:17:00 2016
(r299575)
@@ -412,16 +412,8 @@ hostap_deliver_data(struct ieee80211vap 
ieee80211_free_node(sta);
}
}
-   if (mcopy != NULL) {
-   int len, err;
-   len = mcopy->m_pkthdr.len;
-   err = ieee80211_vap_xmitpkt(vap, mcopy);
-   if (err) {
-   /* NB: IFQ_HANDOFF reclaims mcopy */
-   } else {
-   if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
-   }
-   }
+   if (mcopy != NULL && ieee80211_vap_xmitpkt(vap, mcopy) == 0)
+   if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
}
if (m != NULL) {
/*
@@ -1798,7 +1790,6 @@ hostap_recv_mgmt(struct ieee80211_node *
 *  [tlv] extended supported rates
 */
ssid = rates = xrates = NULL;
-   sfrm = frm;
while (efrm - frm > 1) {
IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return);
switch (*frm) {

Modified: head/sys/net80211/ieee80211_hwmp.c
==
--- head/sys/net80211/ieee80211_hwmp.c  Thu May 12 22:13:12 2016
(r299574)
+++ head/sys/net80211/ieee80211_hwmp.c  Thu May 12 22:17:00 2016
(r299575)
@@ -128,7 +128,6 @@ typedef uint32_t ieee80211_hwmp_seq;
 #defineHWMP_SEQ_LEQ(a, b)  ((int32_t)((a)-(b)) <= 0)
 #defineHWMP_SEQ_EQ(a, b)   ((int32_t)((a)-(b)) == 0)
 #defineHWMP_SEQ_GT(a, b)   ((int32_t)((a)-(b)) > 0)
-#defineHWMP_SEQ_GEQ(a, b)  ((int32_t)((a)-(b)) >= 0)
 
 #define HWMP_SEQ_MAX(a, b) (a > b ? a : b)
 
@@ -1526,7 +1525,6 @@ hwmp_peerdown(struct ieee80211_node *ni)
 #definePERR_DADDR(n)   perr->perr_dests[n].dest_addr
 #definePERR_DSEQ(n)perr->perr_dests[n].dest_seq
 #definePERR_DEXTADDR(n)perr->perr_dests[n].dest_ext_addr
-#definePERR_DRCODE(n)  perr->perr_dests[n].dest_rcode
 static void
 hwmp_recv_perr(struct ieee80211vap *vap, struct ieee80211_node *ni,
 const struct ieee80211_frame *wh, const struct ieee80211_meshperr_ie *perr)
@@ -1628,7 +1626,6 @@ done:
 #undef PERR_DADDR
 #undef PERR_DSEQ
 #undef PERR_DEXTADDR
-#undef PERR_DRCODE
 
 static int
 hwmp_send_perr(struct ieee80211vap *vap,
@@ -1737,7 +1734,6 @@ hwmp_recv_rann(struct ieee80211vap *vap,
struct ieee80211_hwmp_route *hr;
struct ieee80211_meshpreq_ie preq;
struct ieee80211_meshrann_ie prann;
-   uint32_t metric = 0;
 
if (IEEE80211_ADDR_EQ(rann->rann_addr, vap->iv_myaddr))
return;
@@ -1766,7 +1762,6 @@ hwmp_recv_rann(struct ieee80211vap *vap,
/* RANN ACCEPTED */
 
ieee80211_hwmp_rannint =