Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ffe533c authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

ipv6: drop unused "dev" arg of icmpv6_send() 



Dunno, what was the idea, it wasn't used for a long time.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbef49da

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -1374,7 +1374,7 @@ static void ipoib_cm_skb_reap(struct work_struct *work) 
			icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED, htonl(mtu));

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

		else if (skb->protocol == htons(ETH_P_IPV6))

			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, priv->dev);

			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);

#endif

		dev_kfree_skb_any(skb);

include/linux/icmpv6.h

+1 −2
Original line number Diff line number Diff line
@@ -174,8 +174,7 @@ struct icmp6_filter { 


extern void				icmpv6_send(struct sk_buff *skb,

						    u8 type, u8 code,

						    __u32 info, 

						    struct net_device *dev);

						    __u32 info);



extern int				icmpv6_init(void);

extern int				icmpv6_err_convert(u8 type, u8 code,

net/ipv4/ip_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev 
		}



		if (mtu >= IPV6_MIN_MTU && mtu < skb->len - tunnel->hlen + gre_hlen) {

			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, dev);

			icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);

			ip_rt_put(rt);

			goto tx_error;

		}

net/ipv6/exthdrs.c

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
			IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

					 IPSTATS_MIB_INHDRERRORS);

			icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,

				    0, skb->dev);

				    0);

			kfree_skb(skb);

			return -1;

		}

net/ipv6/icmp.c

+2 −3
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ static __inline__ void icmpv6_xmit_unlock(struct sock *sk) 
 */

void icmpv6_param_prob(struct sk_buff *skb, u8 code, int pos)

{

	icmpv6_send(skb, ICMPV6_PARAMPROB, code, pos, skb->dev);

	icmpv6_send(skb, ICMPV6_PARAMPROB, code, pos);

	kfree_skb(skb);

}
@@ -300,8 +300,7 @@ static inline void mip6_addr_swap(struct sk_buff *skb) {} 
/*

 *	Send an ICMP message in response to a packet in error

 */

void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info,

		 struct net_device *dev)

void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info)

{

	struct net *net = dev_net(skb->dev);

	struct inet6_dev *idev = NULL;