diff --git a/[refs] b/[refs] index 4b0da926ea87..e268e2c12a58 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c01ec0d82885d4764d066c9a1e3a431e6fb0f04 +refs/heads/master: 16d3659fcda922a31873e9e827b12c825b36fd11 diff --git a/trunk/drivers/staging/winbond/linux/wbusb.c b/trunk/drivers/staging/winbond/linux/wbusb.c index d9c3a16c4156..75213b53a49f 100644 --- a/trunk/drivers/staging/winbond/linux/wbusb.c +++ b/trunk/drivers/staging/winbond/linux/wbusb.c @@ -107,11 +107,8 @@ static void wbsoft_configure_filter(struct ieee80211_hw *dev, static int wbsoft_tx(struct ieee80211_hw *dev, struct sk_buff *skb) { - char *buffer = kmalloc(skb->len, GFP_ATOMIC); - printk("Sending frame %d bytes\n", skb->len); - memcpy(buffer, skb->data, skb->len); - if (1 == MLMESendFrame(my_adapter, buffer, skb->len, FRAME_TYPE_802_11_MANAGEMENT)) - printk("frame sent ok (%d bytes)?\n", skb->len); + MLMESendFrame(my_adapter, skb->data, skb->len, FRAME_TYPE_802_11_MANAGEMENT); + return NETDEV_TX_OK; }