diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-30 22:25:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-30 22:25:49 +0200 |
| commit | f139c74a8df071217dcd63f3ef06ae7be7071c4d (patch) | |
| tree | 5711f695577a18a06dbcd0101956e97b388ffa1a /include/net/ip.h | |
| parent | net: mvpp2: implement ioctl() operation for PHY ioctls (diff) | |
| parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
| download | linux-f139c74a8df071217dcd63f3ef06ae7be7071c4d.tar.xz linux-f139c74a8df071217dcd63f3ef06ae7be7071c4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip.h')
| -rw-r--r-- | include/net/ip.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/net/ip.h b/include/net/ip.h index 09b32da1b929..db4a771b9ef3 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -316,16 +316,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb) } } -#define IP_IDENTS_SZ 2048u -extern atomic_t *ip_idents; - -static inline u32 ip_idents_reserve(u32 hash, int segs) -{ - atomic_t *id_ptr = ip_idents + hash % IP_IDENTS_SZ; - - return atomic_add_return(segs, id_ptr) - segs; -} - +u32 ip_idents_reserve(u32 hash, int segs); void __ip_select_ident(struct iphdr *iph, int segs); static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs) |