diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-01 13:29:55 -0500 |
| commit | 0dbd888936a23514716b8d944775bc56f731363a (patch) | |
| tree | a2c60cdc45bdcbed47680731fa8188bffe58c098 /include/net/ip6_tunnel.h | |
| parent | 0b442d2c28479332610c46e1a74e5638ab63a97d (diff) | |
| parent | d395991c117d43bfca97101a931a41d062a93852 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/ip6_tunnel.h')
| -rw-r--r-- | include/net/ip6_tunnel.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index c17fa1fdc356..6512d85f11b3 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h | |||
| @@ -14,8 +14,6 @@ | |||
| 14 | /* capable of receiving packets */ | 14 | /* capable of receiving packets */ |
| 15 | #define IP6_TNL_F_CAP_RCV 0x20000 | 15 | #define IP6_TNL_F_CAP_RCV 0x20000 |
| 16 | 16 | ||
| 17 | #define IP6_TNL_MAX 128 | ||
| 18 | |||
| 19 | /* IPv6 tunnel */ | 17 | /* IPv6 tunnel */ |
| 20 | 18 | ||
| 21 | struct ip6_tnl { | 19 | struct ip6_tnl { |