Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  wireless: remove duplicated .ndo_set_mac_address
  netfilter: xtables: fix IPv6 dependency in the cluster match
  tg3: Add GRO support.
  niu: Add GRO support.
  ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().
  gianfar: Fix use-after-of_node_put() in gfar_of_init().
  kernel: remove HIPQUAD()
  netpoll: store local and remote ip in net-endian
  netfilter: fix endian bug in conntrack printks
  dmascc: fix incomplete conversion to network_device_ops
  gso: Fix support for linear packets
  skbuff.h: fix missing kernel-doc
  ni5010: convert to net_device_ops

4 files changed, 33 insertions, 26 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 755414cd49d1..b5873bdff612 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -345,8 +345,8 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
         udph->dest = htons(np->remote_port);
         udph->len = htons(udp_len);
         udph->check = 0;
-        udph->check = csum_tcpudp_magic(htonl(np->local_ip),
-                                        htonl(np->remote_ip),
+        udph->check = csum_tcpudp_magic(np->local_ip,
+                                        np->remote_ip,
                                         udp_len, IPPROTO_UDP,
                                         csum_partial(udph, udp_len, 0));
         if (udph->check == 0)
@@ -365,8 +365,8 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
         iph->ttl      = 64;
         iph->protocol = IPPROTO_UDP;
         iph->check    = 0;
-        put_unaligned(htonl(np->local_ip), &(iph->saddr));
-        put_unaligned(htonl(np->remote_ip), &(iph->daddr));
+        put_unaligned(np->local_ip, &(iph->saddr));
+        put_unaligned(np->remote_ip, &(iph->daddr));
         iph->check    = ip_fast_csum((unsigned char *)iph, iph->ihl);
 
         eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
@@ -424,7 +424,7 @@ static void arp_reply(struct sk_buff *skb)
         memcpy(&tip, arp_ptr, 4);
 
         /* Should we ignore arp? */
-        if (tip != htonl(np->local_ip) ||
+        if (tip != np->local_ip ||
             ipv4_is_loopback(tip) || ipv4_is_multicast(tip))
                 return;
 
@@ -533,9 +533,9 @@ int __netpoll_rx(struct sk_buff *skb)
                 goto out;
         if (checksum_udp(skb, uh, ulen, iph->saddr, iph->daddr))
                 goto out;
-        if (np->local_ip && np->local_ip != ntohl(iph->daddr))
+        if (np->local_ip && np->local_ip != iph->daddr)
                 goto out;
-        if (np->remote_ip && np->remote_ip != ntohl(iph->saddr))
+        if (np->remote_ip && np->remote_ip != iph->saddr)
                 goto out;
         if (np->local_port && np->local_port != ntohs(uh->dest))
                 goto out;
@@ -560,14 +560,14 @@ void netpoll_print_options(struct netpoll *np)
 {
         printk(KERN_INFO "%s: local port %d\n",
                          np->name, np->local_port);
-        printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
-                         np->name, HIPQUAD(np->local_ip));
+        printk(KERN_INFO "%s: local IP %pI4\n",
+                         np->name, &np->local_ip);
         printk(KERN_INFO "%s: interface %s\n",
                          np->name, np->dev_name);
         printk(KERN_INFO "%s: remote port %d\n",
                          np->name, np->remote_port);
-        printk(KERN_INFO "%s: remote IP %d.%d.%d.%d\n",
-                         np->name, HIPQUAD(np->remote_ip));
+        printk(KERN_INFO "%s: remote IP %pI4\n",
+                         np->name, &np->remote_ip);
         printk(KERN_INFO "%s: remote ethernet address %pM\n",
                          np->name, np->remote_mac);
 }
@@ -589,7 +589,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
                 if ((delim = strchr(cur, '/')) == NULL)
                         goto parse_failed;
                 *delim = 0;
-                np->local_ip = ntohl(in_aton(cur));
+                np->local_ip = in_aton(cur);
                 cur = delim;
         }
         cur++;
@@ -618,7 +618,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
         if ((delim = strchr(cur, '/')) == NULL)
                 goto parse_failed;
         *delim = 0;
-        np->remote_ip = ntohl(in_aton(cur));
+        np->remote_ip = in_aton(cur);
         cur = delim + 1;
 
         if (*cur != 0) {
@@ -759,10 +759,9 @@ int netpoll_setup(struct netpoll *np)
                         goto release;
                 }
 
-                np->local_ip = ntohl(in_dev->ifa_list->ifa_local);
+                np->local_ip = in_dev->ifa_list->ifa_local;
                 rcu_read_unlock();
-                printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
-                       np->name, HIPQUAD(np->local_ip));
+                printk(KERN_INFO "%s: local IP %pI4\n", np->name, &np->local_ip);
         }
 
         if (np->rx_hook) {
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 6acbf9e79eb1..ce6356cd9f71 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2579,7 +2579,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features)
                                           skb_network_header_len(skb));
                 skb_copy_from_linear_data(skb, nskb->data, doffset);
 
-                if (pos >= offset + len)
+                if (fskb != skb_shinfo(skb)->frag_list)
                         continue;
 
                 if (!sg) {
diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c
index 409c8be58e7c..8bd98c84f77e 100644
--- a/net/netfilter/nf_conntrack_irc.c
+++ b/net/netfilter/nf_conntrack_irc.c
@@ -66,7 +66,7 @@ static const char *const dccprotos[] = {
  *      ad_beg_p        returns pointer to first byte of addr data
  *      ad_end_p        returns pointer to last byte of addr data
  */
-static int parse_dcc(char *data, const char *data_end, u_int32_t *ip,
+static int parse_dcc(char *data, const char *data_end, __be32 *ip,
                      u_int16_t *port, char **ad_beg_p, char **ad_end_p)
 {
         char *tmp;
@@ -85,7 +85,7 @@ static int parse_dcc(char *data, const char *data_end, u_int32_t *ip,
                 return -1;
 
         *ad_beg_p = data;
-        *ip = simple_strtoul(data, &data, 10);
+        *ip = cpu_to_be32(simple_strtoul(data, &data, 10));
 
         /* skip blanks between ip and port */
         while (*data == ' ') {
@@ -112,7 +112,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,
         int dir = CTINFO2DIR(ctinfo);
         struct nf_conntrack_expect *exp;
         struct nf_conntrack_tuple *tuple;
-        u_int32_t dcc_ip;
+        __be32 dcc_ip;
         u_int16_t dcc_port;
         __be16 port;
         int i, ret = NF_ACCEPT;
@@ -177,13 +177,14 @@ static int help(struct sk_buff *skb, unsigned int protoff,
                                 pr_debug("unable to parse dcc command\n");
                                 continue;
                         }
-                        pr_debug("DCC bound ip/port: %u.%u.%u.%u:%u\n",
-                                 HIPQUAD(dcc_ip), dcc_port);
+
+                        pr_debug("DCC bound ip/port: %pI4:%u\n",
+                                 &dcc_ip, dcc_port);
 
                         /* dcc_ip can be the internal OR external (NAT'ed) IP */
                         tuple = &ct->tuplehash[dir].tuple;
-                        if (tuple->src.u3.ip != htonl(dcc_ip) &&
-                            tuple->dst.u3.ip != htonl(dcc_ip)) {
+                        if (tuple->src.u3.ip != dcc_ip &&
+                            tuple->dst.u3.ip != dcc_ip) {
                                 if (net_ratelimit())
                                         printk(KERN_WARNING
                                                 "Forged DCC command from %pI4: %pI4:%u\n",
diff --git a/net/netfilter/xt_cluster.c b/net/netfilter/xt_cluster.c
index ad5bd890e4e8..6c4847662b85 100644
--- a/net/netfilter/xt_cluster.c
+++ b/net/netfilter/xt_cluster.c
@@ -58,6 +58,13 @@ xt_cluster_hash(const struct nf_conn *ct,
 }
 
 static inline bool
+xt_cluster_ipv6_is_multicast(const struct in6_addr *addr)
+{
+        __be32 st = addr->s6_addr32[0];
+        return ((st & htonl(0xFF000000)) == htonl(0xFF000000));
+}
+
+static inline bool
 xt_cluster_is_multicast_addr(const struct sk_buff *skb, u_int8_t family)
 {
         bool is_multicast = false;
@@ -67,8 +74,8 @@ xt_cluster_is_multicast_addr(const struct sk_buff *skb, u_int8_t family)
                 is_multicast = ipv4_is_multicast(ip_hdr(skb)->daddr);
                 break;
         case NFPROTO_IPV6:
-                is_multicast = ipv6_addr_type(&ipv6_hdr(skb)->daddr) &
-                                                IPV6_ADDR_MULTICAST;
+                is_multicast =
+                        xt_cluster_ipv6_is_multicast(&ipv6_hdr(skb)->daddr);
                 break;
         default:
                 WARN_ON(1);