diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
| commit | 4f130f0d56141feae10c8a1140a74f8d227c0638 (patch) | |
| tree | 845fb5ac2d240489ad4b68af6ca57aa34b71e048 /drivers/net/wan/hdlc.c | |
| parent | 81957a36b93cd372fb4cfb476c0481d4a9c08ded (diff) | |
| parent | 55f9d6786de2f9cf37db50dbe8ae16f887f3ad7f (diff) | |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/wan/hdlc.c')
| -rw-r--r-- | drivers/net/wan/hdlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/hdlc.c b/drivers/net/wan/hdlc.c index 7596eae1b35c..cc07236ea734 100644 --- a/drivers/net/wan/hdlc.c +++ b/drivers/net/wan/hdlc.c @@ -66,7 +66,7 @@ static int hdlc_rcv(struct sk_buff *skb, struct net_device *dev, return hdlc->proto->netif_rx(skb); } -int hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t hdlc_start_xmit(struct sk_buff *skb, struct net_device *dev) { hdlc_device *hdlc = dev_to_hdlc(dev); |