---

yaml --- r: 150738 b: refs/heads/master c: d65a68a h: refs/heads/master v: v3
git-mirror · Jun 8, 2009 · 6e91135 · 6e91135
1 parent 106a295
commit 6e91135
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b07878e5471a8c880cb3cffee3a73048f38d2001
+refs/heads/master: d65a68a8da5c9d1041ebc5e018e677d641910668
diff --git a/trunk/drivers/net/usb/hso.c b/trunk/drivers/net/usb/hso.c
@@ -899,15 +899,14 @@ static void packetizeRx(struct hso_net *odev, unsigned char *ip_pkt,
 					continue;
 				}
 				/* Allocate an sk_buff */
-				odev->skb_rx_buf = dev_alloc_skb(frame_len);
+				odev->skb_rx_buf = netdev_alloc_skb(odev->net,
+								    frame_len);
 				if (!odev->skb_rx_buf) {
 					/* We got no receive buffer. */
 					D1("could not allocate memory");
 					odev->rx_parse_state = WAIT_SYNC;
 					return;
 				}
-				/* Here's where it came from */
-				odev->skb_rx_buf->dev = odev->net;
 
 				/* Copy what we got so far. make room for iphdr
 				 * after tail. */