diff options
| author | Kim, Leo <leo.kim@atmel.com> | 2015-09-08 17:08:03 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-12 18:24:46 -0700 |
| commit | 721c9859478345d2c3593ce798af8c1c1dfdef68 (patch) | |
| tree | cc93c9e58f5619dbb2f968598c7451a619c00512 /drivers/staging/wilc1000/linux_mon.c | |
| parent | e89419bc9cde142639acbe5c40791a43940896f1 (diff) | |
| download | op-kernel-dev-721c9859478345d2c3593ce798af8c1c1dfdef68.zip op-kernel-dev-721c9859478345d2c3593ce798af8c1c1dfdef68.tar.gz | |
staging: wilc1000: delete definition USE_WIRELESS
The preprocessor definition, USE_WIRELESS is always in use.
So, this patch deletes the definitions from the makefile and source codes.
Signed-off-by: Leo Kim <leo.kim@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/linux_mon.c')
| -rw-r--r-- | drivers/staging/wilc1000/linux_mon.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c index dd80071..d873877 100644 --- a/drivers/staging/wilc1000/linux_mon.c +++ b/drivers/staging/wilc1000/linux_mon.c @@ -31,9 +31,7 @@ extern linux_wlan_t *g_linux_wlan; static struct net_device *wilc_wfi_mon; /* global monitor netdev */ -#if USE_WIRELESS extern int mac_xmit(struct sk_buff *skb, struct net_device *dev); -#endif u8 srcAdd[6]; @@ -346,7 +344,6 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb, PRINT_INFO(HOSTAPD_DBG, "SKB netdevice name = %s\n", skb->dev->name); PRINT_INFO(HOSTAPD_DBG, "MONITOR real dev name = %s\n", mon_priv->real_ndev->name); - #if USE_WIRELESS /* Identify if Ethernet or MAC header (data or mgmt) */ memcpy(srcAdd, &skb->data[10], 6); memcpy(bssid, &skb->data[16], 6); @@ -357,7 +354,6 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb, dev_kfree_skb(skb); } else ret = mac_xmit(skb, mon_priv->real_ndev); - #endif /* return NETDEV_TX_OK; */ return ret; @@ -388,7 +384,6 @@ static void WILC_WFI_mon_setup(struct net_device *dev) dev->type = ARPHRD_IEEE80211_RADIOTAP; eth_zero_addr(dev->dev_addr); - #ifdef USE_WIRELESS { /* u8 * mac_add; */ unsigned char mac_add[] = {0x00, 0x50, 0xc2, 0x5e, 0x10, 0x8f}; @@ -398,9 +393,6 @@ static void WILC_WFI_mon_setup(struct net_device *dev) /* mac_add[ETH_ALEN-1]+=1; */ memcpy(dev->dev_addr, mac_add, ETH_ALEN); } - #else - dev->dev_addr[0] = 0x12; - #endif } |
