From 1a24cb141a4b564bbc9270853863ede04bd7a646 Mon Sep 17 00:00:00 2001 From: mentor Date: Fri, 6 Jun 2008 19:42:24 +0000 Subject: [PATCH] Use vlan_hwaccel_rx instead of vlan_hwaccel_receive_skb, as this is the non-polling (non-NAPI) version. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3709 0192ed92-7a03-0410-a25b-9323aeb14dbd --- net80211/ieee80211_input.c | 3 +-- net80211/ieee80211_linux.h | 4 ---- net80211/ieee80211_skb.c | 8 ++++---- net80211/ieee80211_skb.h | 11 +++++------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c index 14e539d..e0c1b9a 100644 --- a/net80211/ieee80211_input.c +++ b/net80211/ieee80211_input.c @@ -1186,7 +1186,7 @@ ieee80211_deliver_data(struct ieee80211_node *ni, struct sk_buff *skb) tni = SKB_NI(skb); if ((ni->ni_vlan != 0) && (vap->iv_vlgrp != NULL)) /* Attach VLAN tag. */ - ret = vlan_hwaccel_receive_skb(skb, + ret = vlan_hwaccel_rx(skb, vap->iv_vlgrp, ni->ni_vlan); else ret = netif_rx(skb); @@ -2271,7 +2271,6 @@ forward_mgmt_to_app(struct ieee80211vap *vap, int subtype, struct sk_buff *skb, if (filter_type && ((vap->app_filter & filter_type) == filter_type)) { struct sk_buff *skb1; - struct ieee80211_node *tni; skb1 = skb_copy(skb, GFP_ATOMIC); if (skb1 == NULL) diff --git a/net80211/ieee80211_linux.h b/net80211/ieee80211_linux.h index 563d619..4ad543a 100644 --- a/net80211/ieee80211_linux.h +++ b/net80211/ieee80211_linux.h @@ -612,10 +612,6 @@ void ieee80211_proc_cleanup(struct ieee80211vap *); #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) #define IEEE80211_VLAN_TAG_USED 1 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20) -#define vlan_hwaccel_receive_skb(skb, grp, tag) vlan_hwaccel_rx(skb, grp, tag) -#endif - #ifndef VLAN_GROUP_ARRAY_PART_LEN #define vlan_group_set_device(group, vid, dev) do { \ group->vlan_devices[vid] = dev; \ diff --git a/net80211/ieee80211_skb.c b/net80211/ieee80211_skb.c index 30b5987..b2f28b2 100644 --- a/net80211/ieee80211_skb.c +++ b/net80211/ieee80211_skb.c @@ -82,7 +82,7 @@ #undef skb_realloc_headroom #undef skb_share_check #undef skb_unshare -#undef vlan_hwaccel_receive_skb +#undef vlan_hwaccel_rx atomic_t skb_total_counter = ATOMIC_INIT(0); EXPORT_SYMBOL(skb_total_counter); @@ -630,10 +630,10 @@ ieee80211_skb_references(void) { #ifdef IEEE80211_DEBUG_REFCNT -int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, +int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp, unsigned short vlan_tag, const char* func, int line) { - return vlan_hwaccel_receive_skb( + return vlan_hwaccel_rx( untrack_skb(skb, 0, func, line, __func__, __LINE__), grp, vlan_tag); } @@ -759,7 +759,7 @@ struct sk_buff * skb_copy_expand_debug(const struct sk_buff *skb, int newheadroo func, line, __func__, __LINE__); } -EXPORT_SYMBOL(vlan_hwaccel_receive_skb_debug); +EXPORT_SYMBOL(vlan_hwaccel_rx_debug); EXPORT_SYMBOL(netif_rx_debug); EXPORT_SYMBOL(alloc_skb_debug); EXPORT_SYMBOL(dev_alloc_skb_debug); diff --git a/net80211/ieee80211_skb.h b/net80211/ieee80211_skb.h index b339acc..5d43840 100644 --- a/net80211/ieee80211_skb.h +++ b/net80211/ieee80211_skb.h @@ -144,9 +144,8 @@ int ieee80211_skb_references(void); #ifdef IEEE80211_DEBUG_REFCNT -int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, - struct vlan_group *grp, unsigned short vlan_tag, - const char* func, int line); +int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp, + unsigned short vlan_tag, const char* func, int line); int netif_rx_debug(struct sk_buff *skb, const char* func, int line); struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask, const char *func, int line); @@ -191,14 +190,14 @@ struct sk_buff * skb_copy_expand_debug(const struct sk_buff *skb, int newheadroo #undef skb_realloc_headroom #undef skb_share_check #undef skb_unshare -#undef vlan_hwaccel_receive_skb +#undef vlan_hwaccel_rx #define skb_unshare(_skb, _pri) \ skb_unshare_debug(_skb, _pri, __func__, __LINE__) #define skb_copy_expand(_skb, _newheadroom, _newtailroom, _gfp_mask) \ skb_copy_expand_debug(_skb, _newheadroom, _newtailroom, _gfp_mask, __func__, __LINE__) -#define vlan_hwaccel_receive_skb(_skb, _grp, _tag) \ - vlan_hwaccel_receive_skb_debug(_skb, _grp, _tag, __func__, __LINE__) +#define vlan_hwaccel_rx(_skb, _grp, _tag) \ + vlan_hwaccel_rx_debug(_skb, _grp, _tag, __func__, __LINE__) #define netif_rx(_skb) \ netif_rx_debug(_skb, __func__, __LINE__) #define alloc_skb(_length, _gfp_mask) \ -- 2.35.1