Merge branch 'upstream-fixes'

3 files changed, 18 insertions, 31 deletions

diff --git a/net/core/filter.c b/net/core/filter.c
index a52665f752..9540946a48 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -74,7 +74,6 @@ static inline void *load_pointer(struct sk_buff *skb, int k,
  * filtering, filter is the array of filter instructions, and
  * len is the number of filter blocks in the array.
  */
- 
 unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int flen)
 {
         struct sock_filter *fentry;     /* We walk down these */
@@ -175,7 +174,7 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
                         continue;
                 case BPF_LD|BPF_W|BPF_ABS:
                         k = fentry->k;
- load_w:
+load_w:
                         ptr = load_pointer(skb, k, 4, &tmp);
                         if (ptr != NULL) {
                                 A = ntohl(*(u32 *)ptr);
@@ -184,7 +183,7 @@ unsigned int sk_run_filter(struct sk_buff *skb, struct sock_filter *filter, int
                         break;
                 case BPF_LD|BPF_H|BPF_ABS:
                         k = fentry->k;
- load_h:
+load_h:
                         ptr = load_pointer(skb, k, 2, &tmp);
                         if (ptr != NULL) {
                                 A = ntohs(*(u16 *)ptr);
@@ -374,7 +373,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen)
                 case BPF_JMP|BPF_JSET|BPF_K:
                 case BPF_JMP|BPF_JSET|BPF_X:
                         /* for conditionals both must be safe */
-                        if (pc + ftest->jt + 1 >= flen ||
+                        if (pc + ftest->jt + 1 >= flen ||
                             pc + ftest->jf + 1 >= flen)
                                 return -EINVAL;
                         break;
@@ -384,7 +383,7 @@ int sk_chk_filter(struct sock_filter *filter, int flen)
                 }
         }
 
-        return (BPF_CLASS(filter[flen - 1].code) == BPF_RET) ? 0 : -EINVAL;
+        return (BPF_CLASS(filter[flen - 1].code) == BPF_RET) ? 0 : -EINVAL;
 }
 
 /**
@@ -404,8 +403,8 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk)
         int err;
 
         /* Make sure new filter is there and in the right amounts. */
-        if (fprog->filter == NULL)
-                return -EINVAL;
+        if (fprog->filter == NULL)
+                return -EINVAL;
 
         fp = sock_kmalloc(sk, fsize+sizeof(*fp), GFP_KERNEL);
         if (!fp)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 281a632fa6..ea51f8d02e 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -703,7 +703,7 @@ int netpoll_setup(struct netpoll *np)
                 }
         }
 
-        if (!memcmp(np->local_mac, "\0\0\0\0\0\0", 6) && ndev->dev_addr)
+        if (is_zero_ether_addr(np->local_mac) && ndev->dev_addr)
                 memcpy(np->local_mac, ndev->dev_addr, 6);
 
         if (!np->local_ip) {
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 39063122fb..3827f881f4 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -139,6 +139,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/wait.h>
+#include <linux/etherdevice.h>
 #include <net/checksum.h>
 #include <net/ipv6.h>
 #include <net/addrconf.h>
@@ -281,8 +282,8 @@ struct pktgen_dev {
         __u32 src_mac_count; /* How many MACs to iterate through */
         __u32 dst_mac_count; /* How many MACs to iterate through */
         
-        unsigned char dst_mac[6];
-        unsigned char src_mac[6];
+        unsigned char dst_mac[ETH_ALEN];
+        unsigned char src_mac[ETH_ALEN];
         
         __u32 cur_dst_mac_offset;
         __u32 cur_src_mac_offset;
@@ -594,16 +595,9 @@ static int pktgen_if_show(struct seq_file *seq, void *v)
 
         seq_puts(seq, "     src_mac: ");
 
-        if ((pkt_dev->src_mac[0] == 0) && 
-            (pkt_dev->src_mac[1] == 0) && 
-            (pkt_dev->src_mac[2] == 0) && 
-            (pkt_dev->src_mac[3] == 0) && 
-            (pkt_dev->src_mac[4] == 0) && 
-            (pkt_dev->src_mac[5] == 0)) 
-
+        if (is_zero_ether_addr(pkt_dev->src_mac))
                 for (i = 0; i < 6; i++) 
                         seq_printf(seq,  "%02X%s", pkt_dev->odev->dev_addr[i], i == 5 ? "  " : ":");
-
         else 
                 for (i = 0; i < 6; i++) 
                         seq_printf(seq,  "%02X%s", pkt_dev->src_mac[i], i == 5 ? "  " : ":");
@@ -1189,9 +1183,9 @@ static ssize_t pktgen_if_write(struct file *file, const char __user *user_buffer
         }
         if (!strcmp(name, "dst_mac")) {
                 char *v = valstr;
-                unsigned char old_dmac[6];
+                unsigned char old_dmac[ETH_ALEN];
                 unsigned char *m = pkt_dev->dst_mac;
-                memcpy(old_dmac, pkt_dev->dst_mac, 6);
+                memcpy(old_dmac, pkt_dev->dst_mac, ETH_ALEN);
                 
                 len = strn_len(&user_buffer[i], sizeof(valstr) - 1);
                 if (len < 0) { return len; }
@@ -1220,8 +1214,8 @@ static ssize_t pktgen_if_write(struct file *file, const char __user *user_buffer
                 }
 
                 /* Set up Dest MAC */
-                if (memcmp(old_dmac, pkt_dev->dst_mac, 6) != 0) 
-                        memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, 6);
+                if (compare_ether_addr(old_dmac, pkt_dev->dst_mac))
+                        memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, ETH_ALEN);
                 
                 sprintf(pg_result, "OK: dstmac");
                 return count;
@@ -1560,17 +1554,11 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
         
         /* Default to the interface's mac if not explicitly set. */
 
-        if ((pkt_dev->src_mac[0] == 0) && 
-            (pkt_dev->src_mac[1] == 0) && 
-            (pkt_dev->src_mac[2] == 0) && 
-            (pkt_dev->src_mac[3] == 0) && 
-            (pkt_dev->src_mac[4] == 0) && 
-            (pkt_dev->src_mac[5] == 0)) {
+        if (is_zero_ether_addr(pkt_dev->src_mac))
+               memcpy(&(pkt_dev->hh[6]), pkt_dev->odev->dev_addr, ETH_ALEN);
 
-               memcpy(&(pkt_dev->hh[6]), pkt_dev->odev->dev_addr, 6);
-       }
         /* Set up Dest MAC */
-        memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, 6);
+        memcpy(&(pkt_dev->hh[0]), pkt_dev->dst_mac, ETH_ALEN);
 
         /* Set up pkt size */
         pkt_dev->cur_pkt_size = pkt_dev->min_pkt_size;