aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion
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/message/fusion
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/message/fusion')
-rw-r--r--drivers/message/fusion/mptlan.c22
-rw-r--r--drivers/message/fusion/mptlan.h2
2 files changed, 10 insertions, 14 deletions
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index 603ffd008c73..a13f6eecd25b 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -815,7 +815,7 @@ mpt_lan_wake_post_buckets_task(struct net_device *dev, int priority)
815 * @priority: 0 = put it on the timer queue, 1 = put it on the immediate queue 815 * @priority: 0 = put it on the timer queue, 1 = put it on the immediate queue
816 */ 816 */
817{ 817{
818 struct mpt_lan_priv *priv = dev->priv; 818 struct mpt_lan_priv *priv = netdev_priv(dev);
819 819
820 if (test_and_set_bit(0, &priv->post_buckets_active) == 0) { 820 if (test_and_set_bit(0, &priv->post_buckets_active) == 0) {
821 if (priority) { 821 if (priority) {
@@ -834,7 +834,7 @@ mpt_lan_wake_post_buckets_task(struct net_device *dev, int priority)
834static int 834static int
835mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb) 835mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb)
836{ 836{
837 struct mpt_lan_priv *priv = dev->priv; 837 struct mpt_lan_priv *priv = netdev_priv(dev);
838 838
839 skb->protocol = mpt_lan_type_trans(skb, dev); 839 skb->protocol = mpt_lan_type_trans(skb, dev);
840 840
@@ -866,7 +866,7 @@ mpt_lan_receive_skb(struct net_device *dev, struct sk_buff *skb)
866static int 866static int
867mpt_lan_receive_post_turbo(struct net_device *dev, u32 tmsg) 867mpt_lan_receive_post_turbo(struct net_device *dev, u32 tmsg)
868{ 868{
869 struct mpt_lan_priv *priv = dev->priv; 869 struct mpt_lan_priv *priv = netdev_priv(dev);
870 MPT_ADAPTER *mpt_dev = priv->mpt_dev; 870 MPT_ADAPTER *mpt_dev = priv->mpt_dev;
871 struct sk_buff *skb, *old_skb; 871 struct sk_buff *skb, *old_skb;
872 unsigned long flags; 872 unsigned long flags;
@@ -921,7 +921,7 @@ static int
921mpt_lan_receive_post_free(struct net_device *dev, 921mpt_lan_receive_post_free(struct net_device *dev,
922 LANReceivePostReply_t *pRecvRep) 922 LANReceivePostReply_t *pRecvRep)
923{ 923{
924 struct mpt_lan_priv *priv = dev->priv; 924 struct mpt_lan_priv *priv = netdev_priv(dev);
925 MPT_ADAPTER *mpt_dev = priv->mpt_dev; 925 MPT_ADAPTER *mpt_dev = priv->mpt_dev;
926 unsigned long flags; 926 unsigned long flags;
927 struct sk_buff *skb; 927 struct sk_buff *skb;
@@ -976,7 +976,7 @@ static int
976mpt_lan_receive_post_reply(struct net_device *dev, 976mpt_lan_receive_post_reply(struct net_device *dev,
977 LANReceivePostReply_t *pRecvRep) 977 LANReceivePostReply_t *pRecvRep)
978{ 978{
979 struct mpt_lan_priv *priv = dev->priv; 979 struct mpt_lan_priv *priv = netdev_priv(dev);
980 MPT_ADAPTER *mpt_dev = priv->mpt_dev; 980 MPT_ADAPTER *mpt_dev = priv->mpt_dev;
981 struct sk_buff *skb, *old_skb; 981 struct sk_buff *skb, *old_skb;
982 unsigned long flags; 982 unsigned long flags;
@@ -1427,11 +1427,9 @@ mptlan_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1427 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device " 1427 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device "
1428 "registered as '%s'\n", ioc->name, dev->name); 1428 "registered as '%s'\n", ioc->name, dev->name);
1429 printk(KERN_INFO MYNAM ": %s/%s: " 1429 printk(KERN_INFO MYNAM ": %s/%s: "
1430 "LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n", 1430 "LanAddr = %pM\n",
1431 IOC_AND_NETDEV_NAMES_s_s(dev), 1431 IOC_AND_NETDEV_NAMES_s_s(dev),
1432 dev->dev_addr[0], dev->dev_addr[1], 1432 dev->dev_addr);
1433 dev->dev_addr[2], dev->dev_addr[3],
1434 dev->dev_addr[4], dev->dev_addr[5]);
1435 1433
1436 ioc->netdev = dev; 1434 ioc->netdev = dev;
1437 1435
@@ -1516,9 +1514,8 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
1516 1514
1517 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n", 1515 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n",
1518 NETDEV_PTR_TO_IOC_NAME_s(dev)); 1516 NETDEV_PTR_TO_IOC_NAME_s(dev));
1519 printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %02x:%02x:%02x:%02x:%02x:%02x\n", 1517 printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %pM\n",
1520 fch->saddr[0], fch->saddr[1], fch->saddr[2], 1518 fch->saddr);
1521 fch->saddr[3], fch->saddr[4], fch->saddr[5]);
1522 } 1519 }
1523 1520
1524 if (*fch->daddr & 1) { 1521 if (*fch->daddr & 1) {
@@ -1537,7 +1534,6 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
1537 1534
1538 fcllc = (struct fcllc *)skb->data; 1535 fcllc = (struct fcllc *)skb->data;
1539 1536
1540
1541 /* Strip the SNAP header from ARP packets since we don't 1537 /* Strip the SNAP header from ARP packets since we don't
1542 * pass them through to the 802.2/SNAP layers. 1538 * pass them through to the 802.2/SNAP layers.
1543 */ 1539 */
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index 33927ee7dc3b..c171afa93239 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -122,7 +122,7 @@ MODULE_DESCRIPTION(LANAME);
122#define dlprintk(x) 122#define dlprintk(x)
123#endif 123#endif
124 124
125#define NETDEV_TO_LANPRIV_PTR(d) ((struct mpt_lan_priv *)(d)->priv) 125#define NETDEV_TO_LANPRIV_PTR(d) ((struct mpt_lan_priv *)netdev_priv(d))
126#define NETDEV_PTR_TO_IOC_NAME_s(d) (NETDEV_TO_LANPRIV_PTR(d)->mpt_dev->name) 126#define NETDEV_PTR_TO_IOC_NAME_s(d) (NETDEV_TO_LANPRIV_PTR(d)->mpt_dev->name)
127#define IOC_AND_NETDEV_NAMES_s_s(d) NETDEV_PTR_TO_IOC_NAME_s(d), (d)->name 127#define IOC_AND_NETDEV_NAMES_s_s(d) NETDEV_PTR_TO_IOC_NAME_s(d), (d)->name
128 128