diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 13:16:40 -0700 |
| commit | 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5 (patch) | |
| tree | 4d4353bb6535aec7822ea71e594154979728e484 /include/linux/wanrouter.h | |
| parent | 2824bd250f0be1551747cc3ed5ae07facc285b57 (diff) | |
| parent | f4637b55ba960d9987a836617271659e9b7b0de8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/wanrouter.h')
| -rw-r--r-- | include/linux/wanrouter.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h index 3e89f0f15f4..1b6b76a4eb5 100644 --- a/include/linux/wanrouter.h +++ b/include/linux/wanrouter.h @@ -516,8 +516,7 @@ struct wan_device { /* Public functions available for device drivers */ extern int register_wan_device(struct wan_device *wandev); extern int unregister_wan_device(char *name); -unsigned short wanrouter_type_trans(struct sk_buff *skb, - struct net_device *dev); +__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev); int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev, unsigned short type); |