Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

8 files changed, 63 insertions, 45 deletions

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 023455a0b34a..399695f7b1af 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -3891,7 +3891,6 @@ claw_init_netdevice(struct net_device * dev)
         dev->type = ARPHRD_SLIP;
         dev->tx_queue_len = 1300;
         dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-        SET_MODULE_OWNER(dev);
 #ifdef FUNCTRACE
         printk(KERN_INFO "%s:%s Exit\n",dev->name,__FUNCTION__);
 #endif
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 92e8a37b5022..449937233732 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -2823,7 +2823,6 @@ ctc_init_netdevice(struct net_device * dev, int alloc_device,
         dev->type = ARPHRD_SLIP;
         dev->tx_queue_len = 100;
         dev->flags = IFF_POINTOPOINT | IFF_NOARP;
-        SET_MODULE_OWNER(dev);
         return dev;
 }
 
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 08a994fdd1a4..0fd663b23d76 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1400,11 +1400,14 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n",
                             cdev->dev.bus_id, dstat, cstat);
                 if (rc) {
-                        lcs_schedule_recovery(card);
-                        wake_up(&card->wait_q);
-                        return;
+                        channel->state = LCS_CH_STATE_ERROR;
                 }
         }
+        if (channel->state == LCS_CH_STATE_ERROR) {
+                lcs_schedule_recovery(card);
+                wake_up(&card->wait_q);
+                return;
+        }
         /* How far in the ccw chain have we processed? */
         if ((channel->state != LCS_CH_STATE_INIT) &&
             (irb->scsw.fctl & SCSW_FCTL_START_FUNC)) {
@@ -1708,6 +1711,8 @@ lcs_stopcard(struct lcs_card *card)
 
         if (card->read.state != LCS_CH_STATE_STOPPED &&
             card->write.state != LCS_CH_STATE_STOPPED &&
+            card->read.state != LCS_CH_STATE_ERROR &&
+            card->write.state != LCS_CH_STATE_ERROR &&
             card->state == DEV_STATE_UP) {
                 lcs_clear_multicast_list(card);
                 rc = lcs_send_stoplan(card,LCS_INITIATOR_TCPIP);
@@ -2145,7 +2150,6 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
         card->dev->stop = lcs_stop_device;
         card->dev->hard_start_xmit = lcs_start_xmit;
         card->dev->get_stats = lcs_getstats;
-        SET_MODULE_OWNER(dev);
         memcpy(card->dev->dev_addr, card->mac, LCS_MAC_LENGTH);
 #ifdef CONFIG_IP_MULTICAST
         if (!lcs_check_multicast_support(card))
diff --git a/drivers/s390/net/lcs.h b/drivers/s390/net/lcs.h
index 0e1e4a0a88f0..8976fb0b070a 100644
--- a/drivers/s390/net/lcs.h
+++ b/drivers/s390/net/lcs.h
@@ -138,6 +138,7 @@ enum lcs_channel_states {
         LCS_CH_STATE_RUNNING,
         LCS_CH_STATE_SUSPENDED,
         LCS_CH_STATE_CLEARED,
+        LCS_CH_STATE_ERROR,
 };
 
 /**
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 268889474339..4d18d6419ddc 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1904,7 +1904,6 @@ static void netiucv_setup_netdevice(struct net_device *dev)
         dev->type                = ARPHRD_SLIP;
         dev->tx_queue_len        = NETIUCV_QUEUELEN_DEFAULT;
         dev->flags               = IFF_POINTOPOINT | IFF_NOARP;
-        SET_MODULE_OWNER(dev);
 }
 
 /**
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h
index 6d4959807abc..8c6b72d05b1d 100644
--- a/drivers/s390/net/qeth.h
+++ b/drivers/s390/net/qeth.h
@@ -833,8 +833,7 @@ struct qeth_card {
         struct qeth_qdio_info qdio;
         struct qeth_perf_stats perf_stats;
         int use_hard_stop;
-        int (*orig_hard_header)(struct sk_buff *,struct net_device *,
-                                unsigned short,void *,void *,unsigned);
+        const struct header_ops *orig_header_ops;
         struct qeth_osn_info osn_info;
         atomic_t force_alloc_skb;
 };
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c
index 70108fb16906..e3c268cfbffe 100644
--- a/drivers/s390/net/qeth_eddp.c
+++ b/drivers/s390/net/qeth_eddp.c
@@ -159,13 +159,15 @@ qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue,
                 buffer = buf->buffer;
                 /* fill one skb into buffer */
                 for (i = 0; i < ctx->elements_per_skb; ++i){
-                        buffer->element[buf->next_element_to_fill].addr =
-                                ctx->elements[element].addr;
-                        buffer->element[buf->next_element_to_fill].length =
-                                ctx->elements[element].length;
-                        buffer->element[buf->next_element_to_fill].flags =
-                                ctx->elements[element].flags;
-                        buf->next_element_to_fill++;
+                        if (ctx->elements[element].length != 0) {
+                                buffer->element[buf->next_element_to_fill].
+                                addr = ctx->elements[element].addr;
+                                buffer->element[buf->next_element_to_fill].
+                                length = ctx->elements[element].length;
+                                buffer->element[buf->next_element_to_fill].
+                                flags = ctx->elements[element].flags;
+                                buf->next_element_to_fill++;
+                        }
                         element++;
                         elements--;
                 }
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index f3e6fbeb2123..a2d08c9ba3c4 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -160,6 +160,9 @@ qeth_set_multicast_list(struct net_device *);
 static void
 qeth_setadp_promisc_mode(struct qeth_card *);
 
+static int
+qeth_hard_header_parse(const struct sk_buff *skb, unsigned char *haddr);
+
 static void
 qeth_notify_processes(void)
 {
@@ -820,14 +823,15 @@ __qeth_delete_all_mc(struct qeth_card *card, unsigned long *flags)
 again:
         list_for_each_entry_safe(addr, tmp, &card->ip_list, entry) {
                 if (addr->is_multicast) {
+                        list_del(&addr->entry);
                         spin_unlock_irqrestore(&card->ip_lock, *flags);
                         rc = qeth_deregister_addr_entry(card, addr);
                         spin_lock_irqsave(&card->ip_lock, *flags);
                         if (!rc) {
-                                list_del(&addr->entry);
                                 kfree(addr);
                                 goto again;
-                        }
+                        } else
+                                list_add(&addr->entry, &card->ip_list);
                 }
         }
 }
@@ -2698,10 +2702,15 @@ qeth_process_inbound_buffer(struct qeth_card *card,
                         qeth_layer2_rebuild_skb(card, skb, hdr);
                 else if (hdr->hdr.l3.id == QETH_HEADER_TYPE_LAYER3)
                         vlan_tag = qeth_rebuild_skb(card, skb, hdr);
-                else { /*in case of OSN*/
+                else if (hdr->hdr.osn.id == QETH_HEADER_TYPE_OSN) {
                         skb_push(skb, sizeof(struct qeth_hdr));
                         skb_copy_to_linear_data(skb, hdr,
                                                 sizeof(struct qeth_hdr));
+                } else { /* unknown header type */
+                        dev_kfree_skb_any(skb);
+                        QETH_DBF_TEXT(trace, 3, "inbunkno");
+                        QETH_DBF_HEX(control, 3, hdr, QETH_DBF_CONTROL_LEN);
+                        continue;
                 }
                 /* is device UP ? */
                 if (!(card->dev->flags & IFF_UP)){
@@ -3787,8 +3796,8 @@ qeth_get_netdevice(enum qeth_card_types type, enum qeth_link_types linktype)
 /*hard_header fake function; used in case fake_ll is set */
 static int
 qeth_fake_header(struct sk_buff *skb, struct net_device *dev,
-                     unsigned short type, void *daddr, void *saddr,
-                     unsigned len)
+                 unsigned short type, const void *daddr, const void *saddr,
+                 unsigned len)
 {
         if(dev->type == ARPHRD_IEEE802_TR){
                 struct trh_hdr *hdr;
@@ -3811,6 +3820,11 @@ qeth_fake_header(struct sk_buff *skb, struct net_device *dev,
         }
 }
 
+static const struct header_ops qeth_fake_ops = {
+        .create = qeth_fake_header,
+        .parse  = qeth_hard_header_parse,
+};
+
 static int
 qeth_send_packet(struct qeth_card *, struct sk_buff *);
 
@@ -4500,7 +4514,8 @@ qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
                         /* check if we have enough elements (including following
                          * free buffers) to handle eddp context */
                         if (qeth_eddp_check_buffers_for_context(queue,ctx) < 0){
-                                printk("eddp tx_dropped 1\n");
+                                if (net_ratelimit())
+                                        PRINT_WARN("eddp tx_dropped 1\n");
                                 rc = -EBUSY;
                                 goto out;
                         }
@@ -4649,7 +4664,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                 [qeth_get_priority_queue(card, skb, ipv, cast_type)];
         if (!card->options.layer2) {
                 ipv = qeth_get_ip_version(skb);
-                if ((card->dev->hard_header == qeth_fake_header) && ipv) {
+                if ((card->dev->header_ops == &qeth_fake_ops) && ipv) {
                         new_skb = qeth_pskb_unshare(skb, GFP_ATOMIC);
                         if (!new_skb)
                                 return -ENOMEM;
@@ -4711,8 +4726,8 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb)
                 rc = qeth_do_send_packet(card, queue, new_skb, hdr,
                                          elements_needed, ctx);
         else {
-                if ((skb->protocol == htons(ETH_P_ARP)) &&
-                    (card->dev->flags & IFF_NOARP)) {
+                if ((!card->options.layer2) &&
+                    (ipv == 0)) {
                         __qeth_free_new_skb(skb, new_skb);
                         return -EPERM;
                 }
@@ -6561,12 +6576,16 @@ static struct ethtool_ops qeth_ethtool_ops = {
 };
 
 static int
-qeth_hard_header_parse(struct sk_buff *skb, unsigned char *haddr)
+qeth_hard_header_parse(const struct sk_buff *skb, unsigned char *haddr)
 {
-        struct qeth_card *card;
-        struct ethhdr *eth;
+        const struct qeth_card *card;
+        const struct ethhdr *eth;
+        struct net_device *dev = skb->dev;
 
-        card = qeth_get_card_from_dev(skb->dev);
+        if (dev->type != ARPHRD_IEEE802_TR)
+                return 0;
+
+        card = qeth_get_card_from_dev(dev);
         if (card->options.layer2)
                 goto haveheader;
 #ifdef CONFIG_QETH_IPV6
@@ -6596,6 +6615,10 @@ haveheader:
         return ETH_ALEN;
 }
 
+static const struct header_ops qeth_null_ops = {
+        .parse = qeth_hard_header_parse,
+};
+
 static int
 qeth_netdev_init(struct net_device *dev)
 {
@@ -6620,12 +6643,8 @@ qeth_netdev_init(struct net_device *dev)
         dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid;
         dev->vlan_rx_add_vid = qeth_vlan_rx_add_vid;
 #endif
-        if (qeth_get_netdev_flags(card) & IFF_NOARP) {
-                dev->rebuild_header = NULL;
-                dev->hard_header = NULL;
-                dev->header_cache_update = NULL;
-                dev->hard_header_cache = NULL;
-        }
+        dev->header_ops = &qeth_null_ops;
+
 #ifdef CONFIG_QETH_IPV6
         /*IPv6 address autoconfiguration stuff*/
         if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD))
@@ -6633,11 +6652,8 @@ qeth_netdev_init(struct net_device *dev)
 #endif
         if (card->options.fake_ll &&
                 (qeth_get_netdev_flags(card) & IFF_NOARP))
-                        dev->hard_header = qeth_fake_header;
-        if (dev->type == ARPHRD_IEEE802_TR)
-                dev->hard_header_parse = NULL;
-        else
-                dev->hard_header_parse = qeth_hard_header_parse;
+                        dev->header_ops = &qeth_fake_ops;
+
         dev->set_mac_address = qeth_layer2_set_mac_address;
         dev->flags |= qeth_get_netdev_flags(card);
         if ((card->options.fake_broadcast) ||
@@ -6649,7 +6665,6 @@ qeth_netdev_init(struct net_device *dev)
         dev->mtu = card->info.initial_mtu;
         if (card->info.type != QETH_CARD_TYPE_OSN)
                 SET_ETHTOOL_OPS(dev, &qeth_ethtool_ops);
-        SET_MODULE_OWNER(dev);
         return 0;
 }
 
@@ -6741,10 +6756,10 @@ retry:
         }
         /*network device will be recovered*/
         if (card->dev) {
-                card->dev->hard_header = card->orig_hard_header;
+                card->dev->header_ops = card->orig_header_ops;
                 if (card->options.fake_ll &&
                     (qeth_get_netdev_flags(card) & IFF_NOARP))
-                        card->dev->hard_header = qeth_fake_header;
+                        card->dev->header_ops = &qeth_fake_ops;
                 return 0;
         }
         /* at first set_online allocate netdev */
@@ -6758,7 +6773,7 @@ retry:
                 goto out;
         }
         card->dev->priv = card;
-        card->orig_hard_header = card->dev->hard_header;
+        card->orig_header_ops = card->dev->header_ops;
         card->dev->type = qeth_get_arphdr_type(card->info.type,
                                                card->info.link_type);
         card->dev->init = qeth_netdev_init;
@@ -8309,7 +8324,7 @@ qeth_arp_constructor(struct neighbour *neigh)
         if (card == NULL)
                 goto out;
         if((card->options.layer2) ||
-           (card->dev->hard_header == qeth_fake_header))
+           (card->dev->header_ops == &qeth_fake_ops))
                 goto out;
 
         rcu_read_lock();