| 1 |
--- linux-source-2.6.22/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-10-08 10:14:25.000000000 +1300 |
| 2 |
+++ linux-source-2.6.22-bcm43xx-patch/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2007-10-08 10:13:12.000000000 +1300 |
| 3 |
@@ -3324,9 +3324,17 @@ |
| 4 |
} |
| 5 |
|
| 6 |
/* This is the opposite of bcm43xx_init_board() */ |
| 7 |
+ |
| 8 |
+static ssize_t bcm43xx_inject_nofcs(struct device *dev, |
| 9 |
+ struct device_attribute *attr, |
| 10 |
+ const char *buf, |
| 11 |
+ size_t cnt); |
| 12 |
+static DEVICE_ATTR(inject_nofcs, 0200, |
| 13 |
+ NULL, bcm43xx_inject_nofcs); |
| 14 |
static void bcm43xx_free_board(struct bcm43xx_private *bcm) |
| 15 |
{ |
| 16 |
bcm43xx_rng_exit(bcm); |
| 17 |
+ device_remove_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs); |
| 18 |
bcm43xx_sysfs_unregister(bcm); |
| 19 |
|
| 20 |
mutex_lock(&(bcm)->mutex); |
| 21 |
@@ -3581,6 +3589,9 @@ |
| 22 |
return err; |
| 23 |
} |
| 24 |
|
| 25 |
+ |
| 26 |
+ |
| 27 |
+ |
| 28 |
static int bcm43xx_init_board(struct bcm43xx_private *bcm) |
| 29 |
{ |
| 30 |
int err; |
| 31 |
@@ -3603,6 +3614,9 @@ |
| 32 |
err = bcm43xx_rng_init(bcm); |
| 33 |
if (err) |
| 34 |
goto err_sysfs_unreg; |
| 35 |
+ err = device_create_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs); |
| 36 |
+ if (err) |
| 37 |
+ goto err_inject_if; |
| 38 |
bcm43xx_periodic_tasks_setup(bcm); |
| 39 |
|
| 40 |
/*FIXME: This should be handled by softmac instead. */ |
| 41 |
@@ -3613,6 +3627,9 @@ |
| 42 |
|
| 43 |
return err; |
| 44 |
|
| 45 |
+err_inject_if: |
| 46 |
+ device_remove_file(&bcm->pci_dev->dev, &dev_attr_inject_nofcs); |
| 47 |
+ |
| 48 |
err_sysfs_unreg: |
| 49 |
bcm43xx_sysfs_unregister(bcm); |
| 50 |
err_wlshutdown: |
| 51 |
@@ -3866,6 +3883,49 @@ |
| 52 |
return err; |
| 53 |
} |
| 54 |
|
| 55 |
+static ssize_t bcm43xx_inject_nofcs(struct device *dev, |
| 56 |
+ struct device_attribute *attr, |
| 57 |
+ const char *buf, |
| 58 |
+ size_t cnt) |
| 59 |
+{ |
| 60 |
+ struct bcm43xx_private *bcm = dev_to_bcm(dev); |
| 61 |
+ struct ieee80211_txb *faketxb; |
| 62 |
+ struct sk_buff *skb; |
| 63 |
+ unsigned long flags; |
| 64 |
+ int err = -ENODEV; |
| 65 |
+ |
| 66 |
+ faketxb = kzalloc(sizeof(struct ieee80211_txb) + sizeof(void *), GFP_KERNEL); |
| 67 |
+ if (!faketxb) |
| 68 |
+ return -ENOMEM; |
| 69 |
+ faketxb->nr_frags = 1; |
| 70 |
+ faketxb->frag_size = cnt; |
| 71 |
+ faketxb->payload_size = cnt; |
| 72 |
+ skb = __dev_alloc_skb(cnt + bcm->ieee->tx_headroom, GFP_KERNEL); |
| 73 |
+ if (!skb) { |
| 74 |
+ kfree(faketxb); |
| 75 |
+ return -ENOMEM; |
| 76 |
+ } |
| 77 |
+ skb_reserve(skb, bcm->ieee->tx_headroom); |
| 78 |
+ memcpy(skb_put(skb, cnt), buf, cnt); |
| 79 |
+ faketxb->fragments[0] = skb; |
| 80 |
+ |
| 81 |
+ spin_lock_irqsave(&bcm->irq_lock, flags); |
| 82 |
+ |
| 83 |
+ if (likely(bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED)) |
| 84 |
+ err = bcm43xx_tx(bcm, faketxb); |
| 85 |
+ |
| 86 |
+ spin_unlock_irqrestore(&bcm->irq_lock, flags); |
| 87 |
+ |
| 88 |
+ if (unlikely(err)) { |
| 89 |
+ dev_kfree_skb(skb); |
| 90 |
+ kfree(faketxb); |
| 91 |
+ return err; |
| 92 |
+ } |
| 93 |
+ |
| 94 |
+ return cnt; |
| 95 |
+} |
| 96 |
+ |
| 97 |
+ |
| 98 |
static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev, |
| 99 |
u8 channel) |
| 100 |
{ |
| 101 |
diff -ur linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c linux-bcm43xx-patch2/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c |
| 102 |
--- linux/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c 2007-02-04 19:44:54.000000000 +0100 |
| 103 |
+++ linux-bcm43xx-patch2/drivers/net/wireless/bcm43xx/bcm43xx_xmit.c 2008-03-01 16:24:43.000000000 +0100 |
| 104 |
-352,7 +352,8 @@ |
| 105 |
|
| 106 |
/* Set the FLAGS field */ |
| 107 |
if (!is_multicast_ether_addr(wireless_header->addr1) && |
| 108 |
- !is_broadcast_ether_addr(wireless_header->addr1)) |
| 109 |
+ !is_broadcast_ether_addr(wireless_header->addr1) && |
| 110 |
+ (bcm->ieee->iw_mode != IW_MODE_MONITOR)) |
| 111 |
flags |= BCM43xx_TXHDRFLAG_EXPECTACK; |
| 112 |
if (1 /* FIXME: PS poll?? */) |
| 113 |
flags |= 0x10; // FIXME: unknown meaning. |