diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-18 01:04:40 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-07-18 01:04:40 +0000 |
| commit | 4116140b9ec7bc5af5577d3197be4be8e53cd854 (patch) | |
| tree | 4117918682568a08997f1b09f75653fe34cab1cc /package | |
| parent | 8a891d72ed376dd5c3ca251ec4e29c8d8b1c6c08 (diff) | |
madwifi: fix crash on 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16889 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/madwifi/patches/432-netdev_ops.patch | 14 | ||||
| -rw-r--r-- | package/madwifi/patches/441-fix_ibss_node_handling.patch | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/package/madwifi/patches/432-netdev_ops.patch b/package/madwifi/patches/432-netdev_ops.patch index be361287d..6cb2c6782 100644 --- a/package/madwifi/patches/432-netdev_ops.patch +++ b/package/madwifi/patches/432-netdev_ops.patch @@ -156,3 +156,17 @@ http://madwifi-project.org/changeset/4005 #if IW_HANDLER_VERSION < 7 dev->get_wireless_stats = ieee80211_iw_getstats; #endif +--- a/net80211/ieee80211_input.c ++++ b/net80211/ieee80211_input.c +@@ -1185,7 +1185,11 @@ ieee80211_deliver_data(struct ieee80211_ + skb1->protocol = __constant_htons(ETH_P_802_2); + /* XXX insert vlan tag before queue it? */ + ni_tmp = SKB_CB(skb1)->ni; /* remember node so we can free it */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29) + ret = dev->hard_start_xmit(skb1, dev); ++#else ++ ret = dev->netdev_ops->ndo_start_xmit(skb1, dev); ++#endif + + if (ret == NETDEV_TX_BUSY) + ieee80211_dev_kfree_skb(&skb1); diff --git a/package/madwifi/patches/441-fix_ibss_node_handling.patch b/package/madwifi/patches/441-fix_ibss_node_handling.patch index d64ebf059..1089f32f3 100644 --- a/package/madwifi/patches/441-fix_ibss_node_handling.patch +++ b/package/madwifi/patches/441-fix_ibss_node_handling.patch @@ -44,7 +44,7 @@ if (dir != IEEE80211_FC1_DIR_NODS) { IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY, wh, "data", "invalid dir 0x%x", dir); -@@ -3548,6 +3553,11 @@ ieee80211_recv_mgmt(struct ieee80211vap +@@ -3552,6 +3557,11 @@ ieee80211_recv_mgmt(struct ieee80211vap } else if (vap->iv_opmode == IEEE80211_M_WDS) { found = 1; ni = ni_or_null = vap->iv_wdsnode; @@ -56,7 +56,7 @@ } IEEE80211_UNLOCK_IRQ(vap->iv_ic); -@@ -3672,19 +3682,8 @@ ieee80211_recv_mgmt(struct ieee80211vap +@@ -3676,19 +3686,8 @@ ieee80211_recv_mgmt(struct ieee80211vap vap->iv_stats.is_rx_ssidmismatch++; /*XXX*/ return; } |