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

Commit d7c35c38 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ixgbe' 



Aaron Brown says:

====================
Intel Wired LAN Driver Updates

This series contains an updates to ixgbe and ixgbevf.

Jacob add braces around some ixgbe_qv_lock_* calls lto better adhere
to Kernel style guidelines.  Don bumps the versions on ixgbe and
ixgbevf to match internal driver functionality better.
====================

Reviewed-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0113e34b 86f359f6

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+4 −2
Original line number Diff line number Diff line
@@ -424,9 +424,10 @@ static inline bool ixgbe_qv_lock_napi(struct ixgbe_q_vector *q_vector) 
#ifdef BP_EXTENDED_STATS

		q_vector->tx.ring->stats.yields++;

#endif

	} else

	} else {

		/* we don't care if someone yielded */

		q_vector->state = IXGBE_QV_STATE_NAPI;

	}

	spin_unlock_bh(&q_vector->lock);

	return rc;

}
@@ -458,9 +459,10 @@ static inline bool ixgbe_qv_lock_poll(struct ixgbe_q_vector *q_vector) 
#ifdef BP_EXTENDED_STATS

		q_vector->rx.ring->stats.yields++;

#endif

	} else

	} else {

		/* preserve yield marks */

		q_vector->state |= IXGBE_QV_STATE_POLL;

	}

	spin_unlock_bh(&q_vector->lock);

	return rc;

}

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ char ixgbe_default_device_descr[] = 
static char ixgbe_default_device_descr[] =

			      "Intel(R) 10 Gigabit Network Connection";

#endif

#define DRV_VERSION "3.15.1-k"

#define DRV_VERSION "3.19.1-k"

const char ixgbe_driver_version[] = DRV_VERSION;

static const char ixgbe_copyright[] =

				"Copyright (c) 1999-2013 Intel Corporation.";

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ const char ixgbevf_driver_name[] = "ixgbevf"; 
static const char ixgbevf_driver_string[] =

	"Intel(R) 10 Gigabit PCI Express Virtual Function Network Driver";



#define DRV_VERSION "2.11.3-k"

#define DRV_VERSION "2.12.1-k"

const char ixgbevf_driver_version[] = DRV_VERSION;

static char ixgbevf_copyright[] =

	"Copyright (c) 2009 - 2012 Intel Corporation.";