mirrors/madwifi
1
0
Fork 0
mirror of https://github.com/proski/madwifi synced 2024-11-21 22:11:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use vlan_hwaccel_rx instead of vlan_hwaccel_receive_skb, as this is the non-polling (non-NAPI) version.

Browse Source 
git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3709 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
mentor 2008-06-06 19:42:24 +00:00
parent f259deab93
commit 1a24cb141a
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net80211/ieee80211_input.c
View File

@ -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)

4
net80211/ieee80211_linux.h
View File

@ -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; \

8
net80211/ieee80211_skb.c
View File

@ -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);

11
net80211/ieee80211_skb.h
View File

@ -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) \