Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4617240 authored by Peter P Waskiewicz's avatar Peter P Waskiewicz Committed by Jeff Garzik
Browse files

ixgbe: Whitespace, copyright update and version number change patch 



This patch cleans up a bit of whitespace issues with the driver, updates
the copyright information, and bumps the version number up.

Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 51ac6445

drivers/net/ixgbe/ixgbe.h

+6 −11
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2007 Intel Corporation.

  Copyright(c) 1999 - 2008 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -20,7 +20,6 @@ 
  the file called "COPYING".



  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
@@ -321,15 +320,11 @@ extern int ixgbe_up(struct ixgbe_adapter *adapter); 
extern void ixgbe_down(struct ixgbe_adapter *adapter);

extern void ixgbe_reinit_locked(struct ixgbe_adapter *adapter);

extern void ixgbe_reset(struct ixgbe_adapter *adapter);

extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);

extern void ixgbe_set_ethtool_ops(struct net_device *netdev);

extern int ixgbe_setup_rx_resources(struct ixgbe_adapter *adapter,

				    struct ixgbe_ring *rxdr);

extern int ixgbe_setup_tx_resources(struct ixgbe_adapter *adapter,

				    struct ixgbe_ring *txdr);

extern void ixgbe_free_rx_resources(struct ixgbe_adapter *adapter,

                                    struct ixgbe_ring *rxdr);

extern void ixgbe_free_tx_resources(struct ixgbe_adapter *adapter,

                                    struct ixgbe_ring *txdr);

extern int ixgbe_setup_rx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);

extern int ixgbe_setup_tx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);

extern void ixgbe_free_rx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);

extern void ixgbe_free_tx_resources(struct ixgbe_adapter *, struct ixgbe_ring *);

extern void ixgbe_update_stats(struct ixgbe_adapter *adapter);



#endif /* _IXGBE_H_ */

drivers/net/ixgbe/ixgbe_82598.c

+18 −40
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2007 Intel Corporation.

  Copyright(c) 1999 - 2008 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -20,7 +20,6 @@ 
  the file called "COPYING".



  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
@@ -42,33 +41,11 @@ 
static s32 ixgbe_get_copper_link_capabilities_82598(struct ixgbe_hw *hw,

                                             ixgbe_link_speed *speed,

                                             bool *autoneg);

static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw);

static s32 ixgbe_setup_fc_82598(struct ixgbe_hw *hw, s32 packetbuf_num);

static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw);

static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,

                               ixgbe_link_speed *speed,

                               bool *link_up, bool link_up_wait_to_complete);

static s32 ixgbe_setup_mac_link_speed_82598(struct ixgbe_hw *hw,

                                            ixgbe_link_speed speed,

                                            bool autoneg,

                                            bool autoneg_wait_to_complete);

static s32 ixgbe_setup_copper_link_82598(struct ixgbe_hw *hw);

static s32 ixgbe_setup_copper_link_speed_82598(struct ixgbe_hw *hw,

                                               ixgbe_link_speed speed,

                                               bool autoneg,

                                               bool autoneg_wait_to_complete);

static s32 ixgbe_reset_hw_82598(struct ixgbe_hw *hw);

static s32 ixgbe_set_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq);

static s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq);

static s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan,

                         u32 vind, bool vlan_on);

static s32 ixgbe_clear_vfta_82598(struct ixgbe_hw *hw);

static s32 ixgbe_blink_led_stop_82598(struct ixgbe_hw *hw, u32 index);

static s32 ixgbe_blink_led_start_82598(struct ixgbe_hw *hw, u32 index);

static s32 ixgbe_read_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 *val);

static s32 ixgbe_write_analog_reg8_82598(struct ixgbe_hw *hw, u32 reg, u8 val);

static s32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw);

static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw);



/**

 */
@@ -408,8 +385,9 @@ static s32 ixgbe_setup_mac_link_82598(struct ixgbe_hw *hw) 
 *

 *  Reads the links register to determine if link is up and the current speed

 **/

static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw, ixgbe_link_speed *speed,

                               bool *link_up, bool link_up_wait_to_complete)

static s32 ixgbe_check_mac_link_82598(struct ixgbe_hw *hw,

                                      ixgbe_link_speed *speed, bool *link_up,

                                      bool link_up_wait_to_complete)

{

	u32 links_reg;

	u32 i;

drivers/net/ixgbe/ixgbe_common.c

+28 −29
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2007 Intel Corporation.

  Copyright(c) 1999 - 2008 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -20,7 +20,6 @@ 
  the file called "COPYING".



  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

drivers/net/ixgbe/ixgbe_common.h

+1 −2
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2007 Intel Corporation.

  Copyright(c) 1999 - 2008 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -20,7 +20,6 @@ 
  the file called "COPYING".



  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

drivers/net/ixgbe/ixgbe_ethtool.c

+32 −30
Original line number Diff line number Diff line 
/*******************************************************************************



  Intel 10 Gigabit PCI Express Linux driver

  Copyright(c) 1999 - 2007 Intel Corporation.

  Copyright(c) 1999 - 2008 Intel Corporation.



  This program is free software; you can redistribute it and/or modify it

  under the terms and conditions of the GNU General Public License,
@@ -20,7 +20,6 @@ 
  the file called "COPYING".



  Contact Information:

  Linux NICS <linux.nics@intel.com>

  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>

  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
@@ -98,6 +97,7 @@ static struct ixgbe_stats ixgbe_gstrings_stats[] = { 
                ((((struct ixgbe_adapter *)netdev->priv)->num_tx_queues + \

                 ((struct ixgbe_adapter *)netdev->priv)->num_rx_queues) * \

                 (sizeof(struct ixgbe_queue_stats) / sizeof(u64)))

#define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN)

#define IXGBE_GLOBAL_STATS_LEN ARRAY_SIZE(ixgbe_gstrings_stats)

#define IXGBE_STATS_LEN (IXGBE_GLOBAL_STATS_LEN + IXGBE_QUEUE_STATS_LEN)
@@ -706,7 +706,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			if (err) {

				while (i) {

					i--;

					ixgbe_free_tx_resources(adapter, &temp_ring[i]);

					ixgbe_free_tx_resources(adapter,

					                        &temp_ring[i]);

				}

				goto err_setup;

			}
@@ -731,7 +732,8 @@ static int ixgbe_set_ringparam(struct net_device *netdev, 
			if (err) {

				while (i) {

					i--;

					ixgbe_free_rx_resources(adapter, &temp_ring[i]);

					ixgbe_free_rx_resources(adapter,

					                        &temp_ring[i]);

				}

				goto err_setup;

			}