ip: introduce ip_is_fragment helper inline function

There are enough instances of this:

    iph->frag_off & htons(IP_MF | IP_OFFSET)

that a helper function is probably warranted.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d117280b9cd8..ebb1d219b45c 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3438,7 +3438,7 @@ static int bond_xmit_hash_policy_l34(struct sk_buff *skb, int count)
         int layer4_xor = 0;
 
         if (skb->protocol == htons(ETH_P_IP)) {
-                if (!(iph->frag_off & htons(IP_MF|IP_OFFSET)) &&
+                if (!ip_is_fragment(iph) &&
                     (iph->protocol == IPPROTO_TCP ||
                      iph->protocol == IPPROTO_UDP)) {
                         layer4_xor = ntohs((*layer4hdr ^ *(layer4hdr + 1)));
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 32f07f868d89..318a25a92310 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -532,7 +532,7 @@ static void ioc3_tcpudp_checksum(struct sk_buff *skb, uint32_t hwsum, int len)
                 return;
 
         ih = (struct iphdr *) ((char *)eh + ETH_HLEN);
-        if (ih->frag_off & htons(IP_MF | IP_OFFSET))
+        if (ip_is_fragment(ih))
                 return;
 
         proto = ih->protocol;
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 3e89a842fc5e..3ed5f3505cea 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2257,7 +2257,7 @@ myri10ge_get_frag_header(struct skb_frag_struct *frag, void **mac_hdr,
         *ip_hdr = iph;
         if (iph->protocol != IPPROTO_TCP)
                 return -1;
-        if (iph->frag_off & htons(IP_MF | IP_OFFSET))
+        if (ip_is_fragment(iph))
                 return -1;
         *hdr_flags |= LRO_TCP;
         *tcpudp_hdr = (u8 *) (*ip_hdr) + (iph->ihl << 2);
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index f4d80f9050ef..043850b8c304 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -4109,7 +4109,7 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                         struct tcphdr *th;
                         ip = ip_hdr(skb);
 
-                        if ((ip->frag_off & htons(IP_OFFSET|IP_MF)) == 0) {
+                        if (!ip_is_fragment(ip)) {
                                 th = (struct tcphdr *)(((unsigned char *)ip) +
                                                        ip->ihl*4);
 
diff --git a/drivers/net/sfc/filter.c b/drivers/net/sfc/filter.c
index 95a980fd63d5..f2fc2587c09d 100644
--- a/drivers/net/sfc/filter.c
+++ b/drivers/net/sfc/filter.c
@@ -652,7 +652,7 @@ int efx_filter_rfs(struct net_device *net_dev, const struct sk_buff *skb,
         /* RFS must validate the IP header length before calling us */
         EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + sizeof(*ip)));
         ip = (const struct iphdr *)(skb->data + nhoff);
-        if (ip->frag_off & htons(IP_MF | IP_OFFSET))
+        if (ip_is_fragment(ip))
                 return -EPROTONOSUPPORT;
         EFX_BUG_ON_PARANOID(!pskb_may_pull(skb, nhoff + 4 * ip->ihl + 4));
         ports = (const __be16 *)(skb->data + nhoff + 4 * ip->ihl);
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 54ca74806bb6..1c92af392992 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -633,7 +633,7 @@ static u32 vxge_get_vpath_no(struct vxgedev *vdev, struct sk_buff *skb)
 
                 ip = ip_hdr(skb);
 
-                if ((ip->frag_off & htons(IP_OFFSET|IP_MF)) == 0) {
+                if (!ip_is_fragment(ip)) {
                         th = (struct tcphdr *)(((unsigned char *)ip) +
                                         ip->ihl*4);