diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-07-13 04:45:00 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 04:45:00 -0400 |
| commit | 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 (patch) | |
| tree | 728174d72943cc9b981a5843553551df62eddc41 /include/linux/wanrouter.h | |
| parent | a98a5d04f400ad112e59cadd739dbabf89417e60 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge with rsync://fileserver/linux
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 3e89f0f15f49..1b6b76a4eb54 100644 --- a/include/linux/wanrouter.h +++ b/include/linux/wanrouter.h | |||
| @@ -516,8 +516,7 @@ struct wan_device { | |||
| 516 | /* Public functions available for device drivers */ | 516 | /* Public functions available for device drivers */ |
| 517 | extern int register_wan_device(struct wan_device *wandev); | 517 | extern int register_wan_device(struct wan_device *wandev); |
| 518 | extern int unregister_wan_device(char *name); | 518 | extern int unregister_wan_device(char *name); |
| 519 | unsigned short wanrouter_type_trans(struct sk_buff *skb, | 519 | __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev); |
| 520 | struct net_device *dev); | ||
| 521 | int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev, | 520 | int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev, |
| 522 | unsigned short type); | 521 | unsigned short type); |
| 523 | 522 | ||