fix madwifi packet injection

This patch from madwifi commit 3337 makes packet injection work.

Signed-off-by: Petr Liebmann <petrliebman@googlemail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12048 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2008-07-31 17:37:09 +00:00
parent 0cc9c8bf11
commit 817bbc5bbf
1 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,34 @@
--- a/THANKS
+++ b/THANKS
@@ -129,6 +129,7 @@
jhansen
Benoit Papillault
Russell Harmon
+Alessandro Erta
Apologies to anyone whose name was unintentionally left off.
Please let us know if you think your name should be mentioned here!
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -2964,7 +2964,7 @@
struct ath_softc *sc = dev->priv;
struct ath_hal *ah = sc->sc_ah;
struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
- (SKB_CB(skb) + sizeof(struct ieee80211_cb));
+ (SKB_CB(skb) + 1); /* NB: SKB_CB casts to CB struct*. */
const HAL_RATE_TABLE *rt;
unsigned int pktlen, hdrlen, try0, power;
HAL_PKT_TYPE atype;
--- a/net80211/ieee80211_monitor.c
+++ b/net80211/ieee80211_monitor.c
@@ -128,8 +128,8 @@
void
ieee80211_monitor_encap(struct ieee80211vap *vap, struct sk_buff *skb)
{
- struct ieee80211_phy_params *ph =
- (struct ieee80211_phy_params *) (SKB_CB(skb) + sizeof(struct ieee80211_cb));
+ struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)
+ (SKB_CB(skb) + 1); /* NB: SKB_CB casts to CB struct*. */
SKB_CB(skb)->flags = M_RAW;
SKB_CB(skb)->ni = NULL;
SKB_CB(skb)->next = NULL;