diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 19:11:44 -0400 |
| commit | 08cd84c81f27d5bd22ba958b7cae6d566c509280 (patch) | |
| tree | 6fdb546c151410851fd3c604d42590afa4215084 /drivers/net/wan/hdlc_ppp.c | |
| parent | e9dd2561793c05d70c9df1bc16a2dde6f23388df (diff) | |
| parent | 327309e899662b482c58cf25f574513d38b5788c (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/net/wan/hdlc_ppp.c')
| -rw-r--r-- | drivers/net/wan/hdlc_ppp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index 7cd6195a2e46..b81263eaede0 100644 --- a/drivers/net/wan/hdlc_ppp.c +++ b/drivers/net/wan/hdlc_ppp.c | |||
| @@ -66,8 +66,7 @@ static void ppp_close(struct net_device *dev) | |||
| 66 | 66 | ||
| 67 | 67 | ||
| 68 | 68 | ||
| 69 | static unsigned short ppp_type_trans(struct sk_buff *skb, | 69 | static __be16 ppp_type_trans(struct sk_buff *skb, struct net_device *dev) |
| 70 | struct net_device *dev) | ||
| 71 | { | 70 | { |
| 72 | return __constant_htons(ETH_P_WAN_PPP); | 71 | return __constant_htons(ETH_P_WAN_PPP); |
| 73 | } | 72 | } |