#include <../drivers/net/bonding/bonding.h>
-@@ -5671,12 +5672,21 @@ static struct fw_info *find_fw_info(int chip)
+@@ -5675,12 +5676,21 @@ static struct fw_info *find_fw_info(int chip)
return NULL;
}
u32 v, port_vec;
enum dev_state state;
u32 params[7], val[7];
-@@ -5713,7 +5723,7 @@ static int adap_init0(struct adapter *adap)
+@@ -5717,7 +5727,7 @@ static int adap_init0(struct adapter *adap)
if ((adap->flags & MASTER_PF) && state != DEV_STATE_INIT) {
struct fw_info *fw_info;
struct fw_hdr *card_fw;
const u8 *fw_data = NULL;
unsigned int fw_size = 0;
-@@ -5736,13 +5746,34 @@ static int adap_init0(struct adapter *adap)
+@@ -5740,13 +5750,34 @@ static int adap_init0(struct adapter *adap)
/* Get FW from from /lib/firmware/ */
ret = request_firmware(&fw, fw_info->fw_mod_name,
adap->pdev_dev);
}
/* upgrade FW logic */
-@@ -5752,6 +5783,8 @@ static int adap_init0(struct adapter *adap)
+@@ -5756,6 +5787,8 @@ static int adap_init0(struct adapter *adap)
/* Cleaning up */
if (fw != NULL)
release_firmware(fw);
}
static inline int is_offload(const struct adapter *adap)
-@@ -3004,6 +3019,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features)
+@@ -3008,6 +3023,7 @@ static int cxgb_set_features(struct net_device *dev, netdev_features_t features)
return err;
}
static u32 get_rss_table_size(struct net_device *dev)
{
const struct port_info *pi = netdev_priv(dev);
-@@ -3032,6 +3048,7 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key)
+@@ -3036,6 +3052,7 @@ static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key)
return write_rss(pi, pi->rss);
return 0;
}
static int get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
u32 *rules)
-@@ -3122,9 +3139,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
+@@ -3126,9 +3143,11 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
.get_wol = get_wol,
.set_wol = set_wol,
.get_rxnfc = get_rxnfc,
.flash_device = set_flash,
};
-@@ -4423,20 +4442,30 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this,
+@@ -4427,20 +4446,30 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this,
struct inet6_ifaddr *ifa = data;
struct net_device *event_dev;
int ret = NOTIFY_DONE;
if (!first_pdev) {
ret = clip_add(slave->dev, ifa, event);
/* If clip_add is success then only initialize
-@@ -4449,6 +4478,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this,
+@@ -4453,6 +4482,10 @@ static int cxgb4_inet6addr_handler(struct notifier_block *this,
to_pci_dev(slave->dev->dev.parent))
ret = clip_add(slave->dev, ifa, event);
}
} else
ret = clip_add(ifa->idev->dev, ifa, event);
-@@ -4459,6 +4492,7 @@ static struct notifier_block cxgb4_inet6addr_notifier = {
+@@ -4463,6 +4496,7 @@ static struct notifier_block cxgb4_inet6addr_notifier = {
.notifier_call = cxgb4_inet6addr_handler
};
/* Retrieves IPv6 addresses from a root device (bond, vlan) associated with
* a physical device.
* The physical device reference is needed to send the actul CLIP command.
-@@ -4504,7 +4538,11 @@ static int update_root_dev_clip(struct net_device *dev)
+@@ -4508,7 +4542,11 @@ static int update_root_dev_clip(struct net_device *dev)
}
for (i = 0; i < VLAN_N_VID; i++) {
if (!root_dev)
continue;
-@@ -6443,9 +6481,25 @@ static int enable_msix(struct adapter *adap)
+@@ -6447,9 +6485,25 @@ static int enable_msix(struct adapter *adap)
#else
need = adap->params.nports + EXTRA_VECS + ofld_need;
#endif
From: Steve Wise <swise@opengridcomputing.com>
-Date: Tue, 2 Dec 2014 15:56:37 -0600
Subject: [PATCH] Fix pr_fmt warnings
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
8 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
-index 74c30f4..abd464b 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -34,6 +34,9 @@
#include <linux/dma-mapping.h>
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
-index 1d5cc79..5afe4af 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -33,6 +33,9 @@
#include <linux/module.h>
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
-index 4e3c59a..d2d8cc5 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -30,6 +30,9 @@
#include <linux/module.h>
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
-index 54eedd9..aae67f0 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c
@@ -30,6 +30,9 @@
#include <linux/list.h>
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-index 71e3f86..3df02db 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -32,6 +32,9 @@
#include <linux/bitmap.h>
diff --git a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
-index 49692a1..3bda559 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
+++ b/drivers/scsi/cxgbi/cxgb3i/cxgb3i.c
@@ -12,6 +12,9 @@
#include <linux/module.h>
diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
-index 1508125..e1fac5f 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
+++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
@@ -11,6 +11,9 @@
#include <linux/module.h>
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
-index 7da59c3..bc41b19 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -11,6 +11,9 @@
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
#include <linux/skbuff.h>
---
-1.7.1
-
-From dc3cc69f6acb3891404cd46300a2934511b605ef Mon Sep 17 00:00:00 2001
From: Selvin Xavier <selvin.xavier@emulex.com>
-Date: Sat, 6 Dec 2014 15:16:41 +0530
-Subject: [PATCH 1/2] be2net: backport patch
+Subject: [PATCH] be2net: backport patch
Signed-off-by: Selvin Xavier <selvin.xavier@emulex.com>
---
drivers/net/ethernet/emulex/benet/be_cmds.c | 6 +-
drivers/net/ethernet/emulex/benet/be_compat.c | 74 +++++++
drivers/net/ethernet/emulex/benet/be_compat.h | 126 +++++++++++
- drivers/net/ethernet/emulex/benet/be_ethtool.c | 43 +++-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 43 ++++-
drivers/net/ethernet/emulex/benet/be_main.c | 271 +++++++++++++++++++++---
7 files changed, 492 insertions(+), 40 deletions(-)
create mode 100644 drivers/net/ethernet/emulex/benet/be_compat.c
create mode 100644 drivers/net/ethernet/emulex/benet/be_compat.h
diff --git a/drivers/net/ethernet/emulex/benet/Makefile b/drivers/net/ethernet/emulex/benet/Makefile
-index 1a91b27..a32863b 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/emulex/benet/Makefile
+++ b/drivers/net/ethernet/emulex/benet/Makefile
@@ -4,4 +4,4 @@
-be2net-y := be_main.o be_cmds.o be_ethtool.o be_roce.o
+be2net-y := be_main.o be_cmds.o be_ethtool.o be_roce.o be_compat.o
diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
-index 9a2d752..fff6982 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -20,6 +20,7 @@
#define be_physfn(adapter) (!adapter->virtfn)
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
-index fead5c6..1d12f49 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1920,7 +1920,11 @@ int be_cmd_rx_filter(struct be_adapter *adapter, u32 flags, u32 value)
+
+#endif /* BE_COMPAT_H */
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
-index e42a791..04628fa 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -380,7 +380,11 @@ static void be_get_ethtool_stats(struct net_device *netdev,
.get_module_eeprom = be_get_module_eeprom
};
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
-index 3e8475c..916c4a3 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -143,8 +143,8 @@ static int be_queue_alloc(struct be_adapter *adapter, struct be_queue_info *q,
static int be_ndo_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh)
{
struct be_adapter *adapter = netdev_priv(dev);
-@@ -4363,6 +4563,8 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+@@ -4368,6 +4568,8 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
BRIDGE_MODE_VEPA : BRIDGE_MODE_VEB);
}
#ifdef CONFIG_BE2NET_VXLAN
static void be_add_vxlan_port(struct net_device *netdev, sa_family_t sa_family,
__be16 port)
-@@ -4421,11 +4623,6 @@ static void be_del_vxlan_port(struct net_device *netdev, sa_family_t sa_family,
+@@ -4426,11 +4628,6 @@ static void be_del_vxlan_port(struct net_device *netdev, sa_family_t sa_family,
"Disabled VxLAN offloads for UDP port %d\n",
be16_to_cpu(port));
}
#endif
static const struct net_device_ops be_netdev_ops = {
-@@ -4435,27 +4632,37 @@ static const struct net_device_ops be_netdev_ops = {
+@@ -4440,27 +4637,37 @@ static const struct net_device_ops be_netdev_ops = {
.ndo_set_rx_mode = be_set_rx_mode,
.ndo_set_mac_address = be_mac_addr_set,
.ndo_change_mtu = be_change_mtu,
#endif
};
-@@ -4481,7 +4688,9 @@ static void be_netdev_init(struct net_device *netdev)
+@@ -4486,7 +4693,9 @@ static void be_netdev_init(struct net_device *netdev)
netdev->vlan_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
netdev->flags |= IFF_MULTICAST;
-@@ -4594,7 +4803,7 @@ static int be_ctrl_init(struct be_adapter *adapter)
+@@ -4599,7 +4808,7 @@ static int be_ctrl_init(struct be_adapter *adapter)
rx_filter->size = sizeof(struct be_cmd_req_rx_filter);
rx_filter->va = dma_zalloc_coherent(&adapter->pdev->dev,
rx_filter->size, &rx_filter->dma,
if (!rx_filter->va) {
status = -ENOMEM;
goto free_mbox;
-@@ -4643,7 +4852,7 @@ static int be_stats_init(struct be_adapter *adapter)
+@@ -4648,7 +4857,7 @@ static int be_stats_init(struct be_adapter *adapter)
cmd->size = sizeof(struct be_cmd_req_get_stats_v2);
cmd->va = dma_zalloc_coherent(&adapter->pdev->dev, cmd->size, &cmd->dma,
if (!cmd->va)
return -ENOMEM;
return 0;
---
-1.7.9.5
-
-From 822ca969cb8d72b7b3e20ea380ce9853e67e95bd Mon Sep 17 00:00:00 2001
From: Selvin Xavier <selvin.xavier@emulex.com>
-Date: Sat, 6 Dec 2014 11:32:39 +0530
-Subject: [PATCH 2/2] ocrdma: Fixing the be2net include path
+Subject: [PATCH] ocrdma: Fixing the be2net include path
Signed-off-by: Selvin Xavier <selvin.xavier@emulex.com>
---
drivers/infiniband/hw/ocrdma/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/infiniband/hw/ocrdma/Makefile b/drivers/infiniband/hw/ocrdma/Makefile
-index d1bfd4f..071f3f7 100644
+index xxxxxxx..xxxxxxx xxxxxx
--- a/drivers/infiniband/hw/ocrdma/Makefile
+++ b/drivers/infiniband/hw/ocrdma/Makefile
@@ -1,4 +1,4 @@
obj-$(CONFIG_INFINIBAND_OCRDMA) += ocrdma.o
---
-1.7.9.5
-