Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 35208
b: refs/heads/master
c: 4187592
h: refs/heads/master
v: v3
  • Loading branch information
Auke Kok authored and Auke Kok committed Aug 31, 2006
1 parent 15d92ca commit 9e2f865
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7cc33234f23f1abb5d2f6639dda1700b1fde4b64
refs/heads/master: 4187592b6d2230d4f9f7177c369dde2aef1a4337
4 changes: 2 additions & 2 deletions trunk/drivers/net/e100.c
Original file line number Diff line number Diff line change
Expand Up @@ -1759,7 +1759,7 @@ static inline void e100_start_receiver(struct nic *nic, struct rx *rx)
#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
static int e100_rx_alloc_skb(struct nic *nic, struct rx *rx)
{
if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + NET_IP_ALIGN)))
if(!(rx->skb = netdev_alloc_skb(nic->netdev, RFD_BUF_LEN + NET_IP_ALIGN)))
return -ENOMEM;

/* Align, init, and map the RFD. */
Expand Down Expand Up @@ -2139,7 +2139,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)

e100_start_receiver(nic, NULL);

if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) {
if(!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
err = -ENOMEM;
goto err_loopback_none;
}
Expand Down

0 comments on commit 9e2f865

Please sign in to comment.