Commit 47298e71 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed support for proprietary ioctl WLC_GET_PKTCNTS 



Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9eed787c

drivers/staging/brcm80211/brcmsmac/wlc_main.c

+0 −18
Original line number Diff line number Diff line
@@ -3542,24 +3542,6 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len, 
		wlc->default_bss->atim_window = (u32) val;

		break;



	case WLC_GET_PKTCNTS:{

			get_pktcnt_t *pktcnt = (get_pktcnt_t *) pval;

			wlc_statsupd(wlc);

			pktcnt->rx_good_pkt = wlc->pub->_cnt->rxframe;

			pktcnt->rx_bad_pkt = wlc->pub->_cnt->rxerror;

			pktcnt->tx_good_pkt =

			    wlc->pub->_cnt->txfrmsnt;

			pktcnt->tx_bad_pkt =

			    wlc->pub->_cnt->txerror +

			    wlc->pub->_cnt->txfail;

			if (len >= (int)sizeof(get_pktcnt_t)) {

				/* Be backward compatible - only if buffer is large enough  */

				pktcnt->rx_ocast_good_pkt =

				    wlc->pub->_cnt->rxmfrmocast;

			}

			break;

		}



#ifdef SUPPORT_HWKEY

	case WLC_GET_WSEC:

		bcmerror =

drivers/staging/brcm80211/include/wlioctl.h

+0 −9
Original line number Diff line number Diff line
@@ -585,15 +585,6 @@ struct maclist { 
	u8 ea[1][ETH_ALEN];	/* variable length array of MAC addresses */

};



/* get pkt count struct passed through ioctl */

typedef struct get_pktcnt {

	uint rx_good_pkt;

	uint rx_bad_pkt;

	uint tx_good_pkt;

	uint tx_bad_pkt;

	uint rx_ocast_good_pkt;	/* unicast packets destined for others */

} get_pktcnt_t;



#ifdef BRCM_FULLMAC

/* Linux network driver ioctl encoding */

typedef struct wl_ioctl {