aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-28 15:49:40 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-28 15:49:40 -0500
commit0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch)
tree454d1842b1833d976da62abcbd5c47521ebe9bd7 /drivers/s390/net
parent54a696bd07c14d3b1192d03ce7269bc59b45209a (diff)
parenteb56092fc168bf5af199d47af50c0d84a96db898 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits) net: Allow dependancies of FDDI & Tokenring to be modular. igb: Fix build warning when DCA is disabled. net: Fix warning fallout from recent NAPI interface changes. gro: Fix potential use after free sfc: If AN is enabled, always read speed/duplex from the AN advertising bits sfc: When disabling the NIC, close the device rather than unregistering it sfc: SFT9001: Add cable diagnostics sfc: Add support for multiple PHY self-tests sfc: Merge top-level functions for self-tests sfc: Clean up PHY mode management in loopback self-test sfc: Fix unreliable link detection in some loopback modes sfc: Generate unique names for per-NIC workqueues 802.3ad: use standard ethhdr instead of ad_header 802.3ad: generalize out mac address initializer 802.3ad: initialize ports LACPDU from const initializer 802.3ad: remove typedef around ad_system 802.3ad: turn ports is_individual into a bool 802.3ad: turn ports is_enabled into a bool 802.3ad: make ntt bool ixgbe: Fix set_ringparam in ixgbe to use the same memory pools. ... Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due to the conversion to %pI (in this networking merge) and the addition of doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'drivers/s390/net')
-rw-r--r--drivers/s390/net/lcs.c12
-rw-r--r--drivers/s390/net/qeth_core_offl.c8
-rw-r--r--drivers/s390/net/qeth_l2_main.c18
3 files changed, 16 insertions, 22 deletions
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index fb6c70cec253..acca6678cb2b 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1295,7 +1295,7 @@ lcs_set_multicast_list(struct net_device *dev)
1295 struct lcs_card *card; 1295 struct lcs_card *card;
1296 1296
1297 LCS_DBF_TEXT(4, trace, "setmulti"); 1297 LCS_DBF_TEXT(4, trace, "setmulti");
1298 card = (struct lcs_card *) dev->priv; 1298 card = (struct lcs_card *) dev->ml_priv;
1299 1299
1300 if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) 1300 if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD))
1301 schedule_work(&card->kernel_thread_starter); 1301 schedule_work(&card->kernel_thread_starter);
@@ -1617,7 +1617,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev)
1617 int rc; 1617 int rc;
1618 1618
1619 LCS_DBF_TEXT(5, trace, "pktxmit"); 1619 LCS_DBF_TEXT(5, trace, "pktxmit");
1620 card = (struct lcs_card *) dev->priv; 1620 card = (struct lcs_card *) dev->ml_priv;
1621 rc = __lcs_start_xmit(card, skb, dev); 1621 rc = __lcs_start_xmit(card, skb, dev);
1622 return rc; 1622 return rc;
1623} 1623}
@@ -1874,7 +1874,7 @@ lcs_getstats(struct net_device *dev)
1874 struct lcs_card *card; 1874 struct lcs_card *card;
1875 1875
1876 LCS_DBF_TEXT(4, trace, "netstats"); 1876 LCS_DBF_TEXT(4, trace, "netstats");
1877 card = (struct lcs_card *) dev->priv; 1877 card = (struct lcs_card *) dev->ml_priv;
1878 return &card->stats; 1878 return &card->stats;
1879} 1879}
1880 1880
@@ -1889,7 +1889,7 @@ lcs_stop_device(struct net_device *dev)
1889 int rc; 1889 int rc;
1890 1890
1891 LCS_DBF_TEXT(2, trace, "stopdev"); 1891 LCS_DBF_TEXT(2, trace, "stopdev");
1892 card = (struct lcs_card *) dev->priv; 1892 card = (struct lcs_card *) dev->ml_priv;
1893 netif_carrier_off(dev); 1893 netif_carrier_off(dev);
1894 netif_tx_disable(dev); 1894 netif_tx_disable(dev);
1895 dev->flags &= ~IFF_UP; 1895 dev->flags &= ~IFF_UP;
@@ -1913,7 +1913,7 @@ lcs_open_device(struct net_device *dev)
1913 int rc; 1913 int rc;
1914 1914
1915 LCS_DBF_TEXT(2, trace, "opendev"); 1915 LCS_DBF_TEXT(2, trace, "opendev");
1916 card = (struct lcs_card *) dev->priv; 1916 card = (struct lcs_card *) dev->ml_priv;
1917 /* initialize statistics */ 1917 /* initialize statistics */
1918 rc = lcs_detect(card); 1918 rc = lcs_detect(card);
1919 if (rc) { 1919 if (rc) {
@@ -2163,7 +2163,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
2163 if (!dev) 2163 if (!dev)
2164 goto out; 2164 goto out;
2165 card->dev = dev; 2165 card->dev = dev;
2166 card->dev->priv = card; 2166 card->dev->ml_priv = card;
2167 card->dev->open = lcs_open_device; 2167 card->dev->open = lcs_open_device;
2168 card->dev->stop = lcs_stop_device; 2168 card->dev->stop = lcs_stop_device;
2169 card->dev->hard_start_xmit = lcs_start_xmit; 2169 card->dev->hard_start_xmit = lcs_start_xmit;
diff --git a/drivers/s390/net/qeth_core_offl.c b/drivers/s390/net/qeth_core_offl.c
index 452874e89740..4080126ca48c 100644
--- a/drivers/s390/net/qeth_core_offl.c
+++ b/drivers/s390/net/qeth_core_offl.c
@@ -350,7 +350,7 @@ static __wsum qeth_eddp_check_tcp4_hdr(struct qeth_eddp_data *eddp,
350 phcsum = csum_tcpudp_nofold(eddp->nh.ip4.h.saddr, eddp->nh.ip4.h.daddr, 350 phcsum = csum_tcpudp_nofold(eddp->nh.ip4.h.saddr, eddp->nh.ip4.h.daddr,
351 eddp->thl + data_len, IPPROTO_TCP, 0); 351 eddp->thl + data_len, IPPROTO_TCP, 0);
352 /* compute checksum of tcp header */ 352 /* compute checksum of tcp header */
353 return csum_partial((u8 *)&eddp->th, eddp->thl, phcsum); 353 return csum_partial(&eddp->th, eddp->thl, phcsum);
354} 354}
355 355
356static __wsum qeth_eddp_check_tcp6_hdr(struct qeth_eddp_data *eddp, 356static __wsum qeth_eddp_check_tcp6_hdr(struct qeth_eddp_data *eddp,
@@ -362,12 +362,12 @@ static __wsum qeth_eddp_check_tcp6_hdr(struct qeth_eddp_data *eddp,
362 QETH_DBF_TEXT(TRACE, 5, "eddpckt6"); 362 QETH_DBF_TEXT(TRACE, 5, "eddpckt6");
363 eddp->th.tcp.h.check = 0; 363 eddp->th.tcp.h.check = 0;
364 /* compute pseudo header checksum */ 364 /* compute pseudo header checksum */
365 phcsum = csum_partial((u8 *)&eddp->nh.ip6.h.saddr, 365 phcsum = csum_partial(&eddp->nh.ip6.h.saddr,
366 sizeof(struct in6_addr), 0); 366 sizeof(struct in6_addr), 0);
367 phcsum = csum_partial((u8 *)&eddp->nh.ip6.h.daddr, 367 phcsum = csum_partial(&eddp->nh.ip6.h.daddr,
368 sizeof(struct in6_addr), phcsum); 368 sizeof(struct in6_addr), phcsum);
369 proto = htonl(IPPROTO_TCP); 369 proto = htonl(IPPROTO_TCP);
370 phcsum = csum_partial((u8 *)&proto, sizeof(u32), phcsum); 370 phcsum = csum_partial(&proto, sizeof(u32), phcsum);
371 return phcsum; 371 return phcsum;
372} 372}
373 373
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index af15bc648ba1..2c48591ced44 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -134,17 +134,13 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
134 mac = &cmd->data.setdelmac.mac[0]; 134 mac = &cmd->data.setdelmac.mac[0];
135 /* MAC already registered, needed in couple/uncouple case */ 135 /* MAC already registered, needed in couple/uncouple case */
136 if (cmd->hdr.return_code == 0x2005) { 136 if (cmd->hdr.return_code == 0x2005) {
137 QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x " 137 QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",
138 "already existing on %s \n", 138 mac, QETH_CARD_IFNAME(card));
139 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
140 QETH_CARD_IFNAME(card));
141 cmd->hdr.return_code = 0; 139 cmd->hdr.return_code = 0;
142 } 140 }
143 if (cmd->hdr.return_code) 141 if (cmd->hdr.return_code)
144 QETH_DBF_MESSAGE(2, "Could not set group MAC " 142 QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %x\n",
145 "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 143 mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
146 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
147 QETH_CARD_IFNAME(card), cmd->hdr.return_code);
148 return 0; 144 return 0;
149} 145}
150 146
@@ -166,10 +162,8 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
166 cmd = (struct qeth_ipa_cmd *) data; 162 cmd = (struct qeth_ipa_cmd *) data;
167 mac = &cmd->data.setdelmac.mac[0]; 163 mac = &cmd->data.setdelmac.mac[0];
168 if (cmd->hdr.return_code) 164 if (cmd->hdr.return_code)
169 QETH_DBF_MESSAGE(2, "Could not delete group MAC " 165 QETH_DBF_MESSAGE(2, "Could not delete group MAC %pM on %s: %x\n",
170 "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n", 166 mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
171 mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
172 QETH_CARD_IFNAME(card), cmd->hdr.return_code);
173 return 0; 167 return 0;
174} 168}
175 169