On Monday 15 December 2008 19:41:13 Larry Finger wrote: > Artur Skawina wrote: > > I have a sinus 154 data usb adapter, which used to work w/ p54 in 2.6.27: > > Can you bisect this problem? Naa I guess its "p54: fix memory management". 872037115977dc07ae05e4b6b769bf8726da4e87 so tell us if this patch works. Regards, Chr
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 9c2c651..3951ce2 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -314,6 +314,7 @@ static void p54u_tx_net2280(struct ieee80211_hw *dev, struct sk_buff *skb, struct net2280_tx_hdr *hdr; struct net2280_reg_write *reg; int err = 0; + struct p54_hdr *pkg_hdr = (struct p54_hdr *) skb->data; reg = kmalloc(sizeof(*reg), GFP_ATOMIC); if (!reg) @@ -336,10 +337,11 @@ static void p54u_tx_net2280(struct ieee80211_hw *dev, struct sk_buff *skb, reg->addr = cpu_to_le32(P54U_DEV_BASE); reg->val = cpu_to_le32(ISL38XX_DEV_INT_DATA); + hdr = (void *)skb_push(skb, sizeof(*hdr)); memset(hdr, 0, sizeof(*hdr)); - hdr->device_addr = ((struct p54_hdr *)skb->data)->req_id; - hdr->len = cpu_to_le16(skb->len + sizeof(struct p54_hdr)); + hdr->device_addr = pkg_hdr->req_id; + hdr->len = cpu_to_le16(skb->len); usb_fill_bulk_urb(int_urb, priv->udev, usb_sndbulkpipe(priv->udev, P54U_PIPE_DEV), reg, sizeof(*reg),
