diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:48:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-26 13:48:39 +0200 |
| commit | 1102c660dd35725a11c7ca9365c237f2f42f6b30 (patch) | |
| tree | cd32d3053b30050182218e0d36b4aed7459c48de /include/linux/netfilter/ipset/ip_set_getport.h | |
| parent | 6e9101aeec39961308176e0f59e73ac5d37d243a (diff) | |
| parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: Linus applied an overlapping commit:
5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypes
So merge it in to make sure we can iterate the file without conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/netfilter/ipset/ip_set_getport.h')
| -rw-r--r-- | include/linux/netfilter/ipset/ip_set_getport.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netfilter/ipset/ip_set_getport.h b/include/linux/netfilter/ipset/ip_set_getport.h index 5aebd170f899..90d09300e954 100644 --- a/include/linux/netfilter/ipset/ip_set_getport.h +++ b/include/linux/netfilter/ipset/ip_set_getport.h @@ -22,7 +22,9 @@ static inline bool ip_set_proto_with_ports(u8 proto) { switch (proto) { case IPPROTO_TCP: + case IPPROTO_SCTP: case IPPROTO_UDP: + case IPPROTO_UDPLITE: return true; } return false; |