Merge branch 'net-module-and-fw-vers' (d6584892) · Commits · 戴 / test

drivers/net/ethernet/broadcom/b44.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@
		#include "b44.h"

		#define DRV_MODULE_NAME "b44"
		#define DRV_MODULE_VERSION "2.0"
		#define DRV_DESCRIPTION "Broadcom 44xx/47xx 10/100 PCI ethernet driver"

		#define B44_DEF_MSG_ENABLE \
		@@ -97,7 +96,6 @@
		MODULE_AUTHOR("Felix Fietkau, Florian Schirmer, Pekka Pietikainen, David S. Miller");
		MODULE_DESCRIPTION(DRV_DESCRIPTION);
		MODULE_LICENSE("GPL");
		MODULE_VERSION(DRV_MODULE_VERSION);

		static int b44_debug = -1; /* -1 == use B44_DEF_MSG_ENABLE as value */
		module_param(b44_debug, int, 0);
		@@ -1791,7 +1789,6 @@ static void b44_get_drvinfo (struct net_device dev, struct ethtool_drvinfo inf
		struct ssb_bus *bus = bp->sdev->bus;

		strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
		strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
		switch (bus->bustype) {
		case SSB_BUSTYPE_PCI:
		strlcpy(info->bus_info, pci_name(bus->host_pci), sizeof(info->bus_info));
		@@ -2347,8 +2344,6 @@ static int b44_init_one(struct ssb_device *sdev,

		instance++;

		pr_info_once("%s version %s\n", DRV_DESCRIPTION, DRV_MODULE_VERSION);

		dev = alloc_etherdev(sizeof(*bp));
		if (!dev) {
		err = -ENOMEM;

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		#include "bcm63xx_enet.h"

		static char bcm_enet_driver_name[] = "bcm63xx_enet";
		static char bcm_enet_driver_version[] = "1.0";

		static int copybreak __read_mostly = 128;
		module_param(copybreak, int, 0);
		@@ -1304,9 +1303,6 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev,
		struct ethtool_drvinfo *drvinfo)
		{
		strlcpy(drvinfo->driver, bcm_enet_driver_name, sizeof(drvinfo->driver));
		strlcpy(drvinfo->version, bcm_enet_driver_version,
		sizeof(drvinfo->version));
		strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
		strlcpy(drvinfo->bus_info, "bcm63xx", sizeof(drvinfo->bus_info));
		}

		@@ -2529,10 +2525,8 @@ static int bcm_enetsw_get_sset_count(struct net_device *netdev,
		static void bcm_enetsw_get_drvinfo(struct net_device *netdev,
		struct ethtool_drvinfo *drvinfo)
		{
		strncpy(drvinfo->driver, bcm_enet_driver_name, 32);
		strncpy(drvinfo->version, bcm_enet_driver_version, 32);
		strncpy(drvinfo->fw_version, "N/A", 32);
		strncpy(drvinfo->bus_info, "bcm63xx", 32);
		strncpy(drvinfo->driver, bcm_enet_driver_name, sizeof(drvinfo->driver));
		strncpy(drvinfo->bus_info, "bcm63xx", sizeof(drvinfo->bus_info));
		}

		static void bcm_enetsw_get_ethtool_stats(struct net_device *netdev,

drivers/net/ethernet/broadcom/bcmsysport.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -287,7 +287,6 @@ static void bcm_sysport_get_drvinfo(struct net_device *dev,
		struct ethtool_drvinfo *info)
		{
		strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
		strlcpy(info->version, "0.1", sizeof(info->version));
		strlcpy(info->bus_info, "platform", sizeof(info->bus_info));
		}

drivers/net/ethernet/broadcom/bnx2.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -59,8 +59,6 @@
		#include "bnx2_fw.h"

		#define DRV_MODULE_NAME "bnx2"
		#define DRV_MODULE_VERSION "2.2.6"
		#define DRV_MODULE_RELDATE "January 29, 2014"
		#define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-6.2.3.fw"
		#define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-6.0.15.fw"
		#define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-6.2.1b.fw"
		@@ -72,13 +70,9 @@
		/* Time in jiffies before concluding the transmitter is hung. */
		#define TX_TIMEOUT (5*HZ)

		static char version[] =
		"QLogic " DRV_MODULE_NAME " Gigabit Ethernet Driver v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";

		MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
		MODULE_DESCRIPTION("QLogic BCM5706/5708/5709/5716 Driver");
		MODULE_LICENSE("GPL");
		MODULE_VERSION(DRV_MODULE_VERSION);
		MODULE_FIRMWARE(FW_MIPS_FILE_06);
		MODULE_FIRMWARE(FW_RV2P_FILE_06);
		MODULE_FIRMWARE(FW_MIPS_FILE_09);
		@@ -7048,7 +7042,6 @@ bnx2_get_drvinfo(struct net_device dev, struct ethtool_drvinfo info)
		struct bnx2 *bp = netdev_priv(dev);

		strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
		strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
		strlcpy(info->bus_info, pci_name(bp->pdev), sizeof(info->bus_info));
		strlcpy(info->fw_version, bp->fw_version, sizeof(info->fw_version));
		}
		@@ -8562,15 +8555,11 @@ static const struct net_device_ops bnx2_netdev_ops = {
		static int
		bnx2_init_one(struct pci_dev pdev, const struct pci_device_id ent)
		{
		static int version_printed = 0;
		struct net_device *dev;
		struct bnx2 *bp;
		int rc;
		char str[40];

		if (version_printed++ == 0)
		pr_info("%s", version);

		/* dev zeroed in init_etherdev */
		dev = alloc_etherdev_mq(sizeof(*bp), TX_MAX_RINGS);
		if (!dev)

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -32,8 +32,14 @@
		* (you will need to reboot afterwards) */
		/* #define BNX2X_STOP_ON_ERROR */

		/* FIXME: Delete the DRV_MODULE_VERSION below, but please be warned
		* that it is not an easy task because such change has all chances
		* to break this driver due to amount of abuse of in-kernel interfaces
		* between modules and FW.
		*
		* DO NOT UPDATE DRV_MODULE_VERSION below.
		*/
		#define DRV_MODULE_VERSION "1.713.36-0"
		#define DRV_MODULE_RELDATE "2014/02/10"
		#define BNX2X_BC_VER 0x040200

		#if defined(CONFIG_DCB)

Admin message