diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-06 03:52:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-06 03:52:44 -0800 |
| commit | 655d2ce073f5927194dbc28d2bd3c062a4a3caac (patch) | |
| tree | 9fa289764e2b3cd8dbdc6d11299f0f16b93414b6 /drivers/net/wan/hdlc_cisco.c | |
| parent | 9c1ca6e68a5d8d58776833b6496c0656a10be50c (diff) | |
| parent | 370076d932ff56a02b9c5328729a69d432cd4b32 (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wan/hdlc_cisco.c')
| -rw-r--r-- | drivers/net/wan/hdlc_cisco.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c index 038a6e748bb..7133c688cf2 100644 --- a/drivers/net/wan/hdlc_cisco.c +++ b/drivers/net/wan/hdlc_cisco.c @@ -250,7 +250,7 @@ static int cisco_rx(struct sk_buff *skb) return NET_RX_DROP; rx_error: - dev_to_desc(dev)->stats.rx_errors++; /* Mark error */ + dev_to_hdlc(dev)->stats.rx_errors++; /* Mark error */ dev_kfree_skb_any(skb); return NET_RX_DROP; } @@ -314,6 +314,7 @@ static struct hdlc_proto proto = { .stop = cisco_stop, .type_trans = cisco_type_trans, .ioctl = cisco_ioctl, + .netif_rx = cisco_rx, .module = THIS_MODULE, }; @@ -360,7 +361,7 @@ static int cisco_ioctl(struct net_device *dev, struct ifreq *ifr) if (result) return result; - result = attach_hdlc_protocol(dev, &proto, cisco_rx, + result = attach_hdlc_protocol(dev, &proto, sizeof(struct cisco_state)); if (result) return result; |