udpv6: Remove unused skb argument of ipv6_select_ident()
- move ipv6_select_ident() inline function to ipv6.h and remove the unused skb argument Signed-off-by: Sridhar Samudrala <sri@us.ibm.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c31d532690
commit
7ea2f2c5a6
|
@ -441,6 +441,18 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add
|
|||
return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr));
|
||||
}
|
||||
|
||||
static __inline__ void ipv6_select_ident(struct frag_hdr *fhdr)
|
||||
{
|
||||
static u32 ipv6_fragmentation_id = 1;
|
||||
static DEFINE_SPINLOCK(ip6_id_lock);
|
||||
|
||||
spin_lock_bh(&ip6_id_lock);
|
||||
fhdr->identification = htonl(ipv6_fragmentation_id);
|
||||
if (++ipv6_fragmentation_id == 0)
|
||||
ipv6_fragmentation_id = 1;
|
||||
spin_unlock_bh(&ip6_id_lock);
|
||||
}
|
||||
|
||||
/*
|
||||
* Prototypes exported by ipv6
|
||||
*/
|
||||
|
|
|
@ -57,18 +57,6 @@
|
|||
|
||||
static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
|
||||
|
||||
static __inline__ void ipv6_select_ident(struct sk_buff *skb, struct frag_hdr *fhdr)
|
||||
{
|
||||
static u32 ipv6_fragmentation_id = 1;
|
||||
static DEFINE_SPINLOCK(ip6_id_lock);
|
||||
|
||||
spin_lock_bh(&ip6_id_lock);
|
||||
fhdr->identification = htonl(ipv6_fragmentation_id);
|
||||
if (++ipv6_fragmentation_id == 0)
|
||||
ipv6_fragmentation_id = 1;
|
||||
spin_unlock_bh(&ip6_id_lock);
|
||||
}
|
||||
|
||||
int __ip6_local_out(struct sk_buff *skb)
|
||||
{
|
||||
int len;
|
||||
|
@ -706,7 +694,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
|
|||
skb_reset_network_header(skb);
|
||||
memcpy(skb_network_header(skb), tmp_hdr, hlen);
|
||||
|
||||
ipv6_select_ident(skb, fh);
|
||||
ipv6_select_ident(fh);
|
||||
fh->nexthdr = nexthdr;
|
||||
fh->reserved = 0;
|
||||
fh->frag_off = htons(IP6_MF);
|
||||
|
@ -844,7 +832,7 @@ slow_path:
|
|||
fh->nexthdr = nexthdr;
|
||||
fh->reserved = 0;
|
||||
if (!frag_id) {
|
||||
ipv6_select_ident(skb, fh);
|
||||
ipv6_select_ident(fh);
|
||||
frag_id = fh->identification;
|
||||
} else
|
||||
fh->identification = frag_id;
|
||||
|
@ -1093,7 +1081,7 @@ static inline int ip6_ufo_append_data(struct sock *sk,
|
|||
skb_shinfo(skb)->gso_size = (mtu - fragheaderlen -
|
||||
sizeof(struct frag_hdr)) & ~7;
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
|
||||
ipv6_select_ident(skb, &fhdr);
|
||||
ipv6_select_ident(&fhdr);
|
||||
skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
|
||||
__skb_queue_tail(&sk->sk_write_queue, skb);
|
||||
|
||||
|
|
Loading…
Reference in New Issue