aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/cls_flow.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/cls_flow.c')
-rw-r--r--net/sched/cls_flow.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 15d68f24a521..461410394d08 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -77,7 +77,7 @@ static u32 flow_get_dst(const struct sk_buff *skb, const struct flow_keys *flow)
77{ 77{
78 if (flow->dst) 78 if (flow->dst)
79 return ntohl(flow->dst); 79 return ntohl(flow->dst);
80 return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol; 80 return addr_fold(skb_dst(skb)) ^ (__force u16) tc_skb_protocol(skb);
81} 81}
82 82
83static u32 flow_get_proto(const struct sk_buff *skb, const struct flow_keys *flow) 83static u32 flow_get_proto(const struct sk_buff *skb, const struct flow_keys *flow)
@@ -98,7 +98,7 @@ static u32 flow_get_proto_dst(const struct sk_buff *skb, const struct flow_keys
98 if (flow->ports) 98 if (flow->ports)
99 return ntohs(flow->port16[1]); 99 return ntohs(flow->port16[1]);
100 100
101 return addr_fold(skb_dst(skb)) ^ (__force u16)skb->protocol; 101 return addr_fold(skb_dst(skb)) ^ (__force u16) tc_skb_protocol(skb);
102} 102}
103 103
104static u32 flow_get_iif(const struct sk_buff *skb) 104static u32 flow_get_iif(const struct sk_buff *skb)
@@ -144,7 +144,7 @@ static u32 flow_get_nfct(const struct sk_buff *skb)
144 144
145static u32 flow_get_nfct_src(const struct sk_buff *skb, const struct flow_keys *flow) 145static u32 flow_get_nfct_src(const struct sk_buff *skb, const struct flow_keys *flow)
146{ 146{
147 switch (skb->protocol) { 147 switch (tc_skb_protocol(skb)) {
148 case htons(ETH_P_IP): 148 case htons(ETH_P_IP):
149 return ntohl(CTTUPLE(skb, src.u3.ip)); 149 return ntohl(CTTUPLE(skb, src.u3.ip));
150 case htons(ETH_P_IPV6): 150 case htons(ETH_P_IPV6):
@@ -156,7 +156,7 @@ fallback:
156 156
157static u32 flow_get_nfct_dst(const struct sk_buff *skb, const struct flow_keys *flow) 157static u32 flow_get_nfct_dst(const struct sk_buff *skb, const struct flow_keys *flow)
158{ 158{
159 switch (skb->protocol) { 159 switch (tc_skb_protocol(skb)) {
160 case htons(ETH_P_IP): 160 case htons(ETH_P_IP):
161 return ntohl(CTTUPLE(skb, dst.u3.ip)); 161 return ntohl(CTTUPLE(skb, dst.u3.ip));
162 case htons(ETH_P_IPV6): 162 case htons(ETH_P_IPV6):