diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 00:29:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 18:08:44 -0500 |
commit | 1d28f42c1bd4bb2363d88df74d0128b4da135b4a (patch) | |
tree | cb2e652fe79a2bc307e871bc2d3fa51cc8051e45 /include/net/xfrm.h | |
parent | ca116922afa8cc5ad46b00c0a637b1cde5ca478a (diff) |
net: Put flowi_* prefix on AF independent members of struct flowi
I intend to turn struct flowi into a union of AF specific flowi
structs. There will be a common structure that each variant includes
first, much like struct sock_common.
This is the first step to move in that direction.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index d5dcf3974636..d5a12d10a0d4 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -803,7 +803,7 @@ static __inline__ | |||
803 | __be16 xfrm_flowi_sport(const struct flowi *fl) | 803 | __be16 xfrm_flowi_sport(const struct flowi *fl) |
804 | { | 804 | { |
805 | __be16 port; | 805 | __be16 port; |
806 | switch(fl->proto) { | 806 | switch(fl->flowi_proto) { |
807 | case IPPROTO_TCP: | 807 | case IPPROTO_TCP: |
808 | case IPPROTO_UDP: | 808 | case IPPROTO_UDP: |
809 | case IPPROTO_UDPLITE: | 809 | case IPPROTO_UDPLITE: |
@@ -830,7 +830,7 @@ static __inline__ | |||
830 | __be16 xfrm_flowi_dport(const struct flowi *fl) | 830 | __be16 xfrm_flowi_dport(const struct flowi *fl) |
831 | { | 831 | { |
832 | __be16 port; | 832 | __be16 port; |
833 | switch(fl->proto) { | 833 | switch(fl->flowi_proto) { |
834 | case IPPROTO_TCP: | 834 | case IPPROTO_TCP: |
835 | case IPPROTO_UDP: | 835 | case IPPROTO_UDP: |
836 | case IPPROTO_UDPLITE: | 836 | case IPPROTO_UDPLITE: |