Skip to contentSkip to conversation

ip6mr: Drop mfc6_cache argument to ip6mr_forward2

PATCH Applied David Ahern 2 participants 2 messages Dec 17, 2018 – Dec 18, 2018

Subsystems (3)
Networking Network drivers IPv4/IPv6
lore
Share & tools
lore

David Ahern

author maintainer
#0 lore raw

PATCH 1/1 ip6mr: Drop mfc6_cache argument to ip6mr_forward2

From: David Ahern <[email protected]>

mfc6_cache is not needed by ip6mr_forward2 so drop it from the input argument list.

Signed-off-by David Ahern <[email protected]>
---
 net/ipv6/ip6mr.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
net/ipv6/ip6mr.c +3 -4
index 8c63494400c4..34b8a90e6be2 100644
@@ -1968,7 +1968,7 @@ static inline int ip6mr_forward2_finish(struct net *net, struct sock *sk, struct
  */
 
 static int ip6mr_forward2(struct net *net, struct mr_table *mrt,
-			  struct sk_buff *skb, struct mfc6_cache *c, int vifi)
+			  struct sk_buff *skb, int vifi)
 {
 	struct ipv6hdr *ipv6h;
 	struct vif_device *vif = &mrt->vif_table[vifi];

@@ -2134,15 +2134,14 @@ static void ip6_mr_forward(struct net *net, struct mr_table *mrt,
 			if (psend != -1) {
 				struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
 				if (skb2)
-					ip6mr_forward2(net, mrt, skb2,
-						       c, psend);
+					ip6mr_forward2(net, mrt, skb2, psend);
 			}
 			psend = ct;
 		}
 	}
 last_forward:
 	if (psend != -1) {
-		ip6mr_forward2(net, mrt, skb, c, psend);
+		ip6mr_forward2(net, mrt, skb, psend);
 		return;
 	}
Signature · 1 line
2.11.0