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

10 files changed, 27 insertions, 49 deletions

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 7999da25fe40..bdfdfd28594d 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1554,10 +1554,8 @@ __u32 secure_tcp_sequence_number(__u32 saddr, __u32 daddr,
 
 EXPORT_SYMBOL(secure_tcp_sequence_number);
 
-
-
-/* Generate secure starting point for ephemeral TCP port search */
-u32 secure_tcp_port_ephemeral(__u32 saddr, __u32 daddr, __u16 dport)
+/* Generate secure starting point for ephemeral IPV4 transport port search */
+u32 secure_ipv4_port_ephemeral(__u32 saddr, __u32 daddr, __u16 dport)
 {
         struct keydata *keyptr = get_keyptr();
         u32 hash[4];
@@ -1575,7 +1573,7 @@ u32 secure_tcp_port_ephemeral(__u32 saddr, __u32 daddr, __u16 dport)
 }
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-u32 secure_tcpv6_port_ephemeral(const __u32 *saddr, const __u32 *daddr, __u16 dport)
+u32 secure_ipv6_port_ephemeral(const __u32 *saddr, const __u32 *daddr, __u16 dport)
 {
         struct keydata *keyptr = get_keyptr();
         u32 hash[12];
@@ -1586,7 +1584,7 @@ u32 secure_tcpv6_port_ephemeral(const __u32 *saddr, const __u32 *daddr, __u16 dp
 
         return twothirdsMD4Transform(daddr, hash);
 }
-EXPORT_SYMBOL(secure_tcpv6_port_ephemeral);
+EXPORT_SYMBOL(secure_ipv6_port_ephemeral);
 #endif
 
 #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 475d98fa9e26..780009c7eaa6 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -47,6 +47,8 @@
 #include <linux/ip.h>
 #include <linux/in.h>
 
+#include <net/dst.h>
+
 MODULE_AUTHOR("Roland Dreier");
 MODULE_DESCRIPTION("IP-over-InfiniBand net driver");
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index ef3ee035bbc8..ed0c2ead8bc1 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -43,6 +43,8 @@
 #include <linux/delay.h>
 #include <linux/completion.h>
 
+#include <net/dst.h>
+
 #include "ipoib.h"
 
 #ifdef CONFIG_INFINIBAND_IPOIB_DEBUG
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index f857ae94d261..b0c3b6ab6263 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -115,6 +115,7 @@
 #include <linux/ethtool.h>
 #include <linux/timer.h>
 #include <linux/if_vlan.h>
+#include <linux/rtnetlink.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index a842ecc60a34..9369f811075d 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -85,7 +85,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb);
 static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb);
 
-static struct proto_ops pppoe_ops;
+static const struct proto_ops pppoe_ops;
 static DEFINE_RWLOCK(pppoe_hash_lock);
 
 static struct ppp_channel_ops pppoe_chan_ops;
@@ -383,8 +383,6 @@ static int pppoe_rcv(struct sk_buff *skb,
 {
         struct pppoe_hdr *ph;
         struct pppox_sock *po;
-        struct sock *sk;
-        int ret;
 
         if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
                 goto drop;
@@ -395,24 +393,8 @@ static int pppoe_rcv(struct sk_buff *skb,
         ph = (struct pppoe_hdr *) skb->nh.raw;
 
         po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source);
-        if (!po) 
-                goto drop;
-
-        sk = sk_pppox(po);
-        bh_lock_sock(sk);
-
-        /* Socket state is unknown, must put skb into backlog. */
-        if (sock_owned_by_user(sk) != 0) {
-                sk_add_backlog(sk, skb);
-                ret = NET_RX_SUCCESS;
-        } else {
-                ret = pppoe_rcv_core(sk, skb);
-        }
-
-        bh_unlock_sock(sk);
-        sock_put(sk);
-
-        return ret;
+        if (po != NULL) 
+                return sk_receive_skb(sk_pppox(po), skb);
 drop:
         kfree_skb(skb);
 out:
@@ -1081,9 +1063,7 @@ static int __init pppoe_proc_init(void)
 static inline int pppoe_proc_init(void) { return 0; }
 #endif /* CONFIG_PROC_FS */
 
-/* ->ioctl are set at pppox_create */
-
-static struct proto_ops pppoe_ops = {
+static const struct proto_ops pppoe_ops = {
     .family             = AF_PPPOX,
     .owner              = THIS_MODULE,
     .release            = pppoe_release,
@@ -1099,7 +1079,8 @@ static struct proto_ops pppoe_ops = {
     .getsockopt         = sock_no_getsockopt,
     .sendmsg            = pppoe_sendmsg,
     .recvmsg            = pppoe_recvmsg,
-    .mmap               = sock_no_mmap
+    .mmap               = sock_no_mmap,
+    .ioctl              = pppox_ioctl,
 };
 
 static struct pppox_proto pppoe_proto = {
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index 0c1e114527fb..9315046b3f55 100644
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -68,8 +68,7 @@ EXPORT_SYMBOL(register_pppox_proto);
 EXPORT_SYMBOL(unregister_pppox_proto);
 EXPORT_SYMBOL(pppox_unbind_sock);
 
-static int pppox_ioctl(struct socket* sock, unsigned int cmd, 
-                       unsigned long arg)
+int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
         struct sock *sk = sock->sk;
         struct pppox_sock *po = pppox_sk(sk);
@@ -105,6 +104,7 @@ static int pppox_ioctl(struct socket* sock, unsigned int cmd,
         return rc;
 }
 
+EXPORT_SYMBOL(pppox_ioctl);
 
 static int pppox_create(struct socket *sock, int protocol)
 {
@@ -119,11 +119,7 @@ static int pppox_create(struct socket *sock, int protocol)
                 goto out;
 
         rc = pppox_protos[protocol]->create(sock);
-        if (!rc) {
-                /* We get to set the ioctl handler. */
-                /* For everything else, pppox is just a shell. */
-                sock->ops->ioctl = pppox_ioctl;
-        }
+
         module_put(pppox_protos[protocol]->owner);
 out:
         return rc;
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index ae7343934758..e1a2d52cc1fe 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -107,6 +107,7 @@
 
 #include        "h/skversion.h"
 
+#include        <linux/in.h>
 #include        <linux/module.h>
 #include        <linux/moduleparam.h>
 #include        <linux/init.h>
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 00d683063c01..d8cc3aea032a 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -25,6 +25,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/in.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 2fc9893d69e1..eb86b059809b 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -24,6 +24,7 @@
 #include <linux/compiler.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/in.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
@@ -3650,7 +3651,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                TXD_FLAG_CPU_POST_DMA);
 
                 skb->nh.iph->check = 0;
-                skb->nh.iph->tot_len = ntohs(mss + ip_tcp_len + tcp_opt_len);
+                skb->nh.iph->tot_len = htons(mss + ip_tcp_len + tcp_opt_len);
                 if (tp->tg3_flags2 & TG3_FLG2_HW_TSO) {
                         skb->h.th->check = 0;
                         base_flags &= ~TXD_FLAG_TCPUDP_CSUM;
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 5e7c7e944c9d..64f6d1f25753 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7456,8 +7456,7 @@ static void ipw_handle_data_packet(struct ipw_priv *priv,
         /* HW decrypt will not clear the WEP bit, MIC, PN, etc. */
         hdr = (struct ieee80211_hdr_4addr *)rxb->skb->data;
         if (priv->ieee->iw_mode != IW_MODE_MONITOR &&
-            ((is_multicast_ether_addr(hdr->addr1) ||
-              is_broadcast_ether_addr(hdr->addr1)) ?
+            (is_multicast_ether_addr(hdr->addr1) ?
              !priv->ieee->host_mc_decrypt : !priv->ieee->host_decrypt))
                 ipw_rebuild_decrypted_skb(priv, rxb->skb);
 
@@ -7648,8 +7647,7 @@ static inline int is_network_packet(struct ipw_priv *priv,
                         return 0;
 
                 /* {broad,multi}cast packets to our BSSID go through */
-                if (is_multicast_ether_addr(header->addr1) ||
-                    is_broadcast_ether_addr(header->addr1))
+                if (is_multicast_ether_addr(header->addr1))
                         return !memcmp(header->addr3, priv->bssid, ETH_ALEN);
 
                 /* packets to our adapter go through */
@@ -7662,8 +7660,7 @@ static inline int is_network_packet(struct ipw_priv *priv,
                         return 0;
 
                 /* {broad,multi}cast packets to our BSS go through */
-                if (is_multicast_ether_addr(header->addr1) ||
-                    is_broadcast_ether_addr(header->addr1))
+                if (is_multicast_ether_addr(header->addr1))
                         return !memcmp(header->addr2, priv->bssid, ETH_ALEN);
 
                 /* packets to our adapter go through */
@@ -9657,8 +9654,7 @@ static inline int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
         switch (priv->ieee->iw_mode) {
         case IW_MODE_ADHOC:
                 hdr_len = IEEE80211_3ADDR_LEN;
-                unicast = !(is_multicast_ether_addr(hdr->addr1) ||
-                            is_broadcast_ether_addr(hdr->addr1));
+                unicast = !is_multicast_ether_addr(hdr->addr1);
                 id = ipw_find_station(priv, hdr->addr1);
                 if (id == IPW_INVALID_STATION) {
                         id = ipw_add_station(priv, hdr->addr1);
@@ -9673,8 +9669,7 @@ static inline int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
 
         case IW_MODE_INFRA:
         default:
-                unicast = !(is_multicast_ether_addr(hdr->addr3) ||
-                            is_broadcast_ether_addr(hdr->addr3));
+                unicast = !is_multicast_ether_addr(hdr->addr3);
                 hdr_len = IEEE80211_3ADDR_LEN;
                 id = 0;
                 break;