diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/meth.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/meth.c')
| -rw-r--r-- | drivers/net/meth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index 42e3294671d7..60135aa55802 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
| @@ -461,7 +461,7 @@ static int meth_tx_full(struct net_device *dev) | |||
| 461 | { | 461 | { |
| 462 | struct meth_private *priv = netdev_priv(dev); | 462 | struct meth_private *priv = netdev_priv(dev); |
| 463 | 463 | ||
| 464 | return (priv->tx_count >= TX_RING_ENTRIES - 1); | 464 | return priv->tx_count >= TX_RING_ENTRIES - 1; |
| 465 | } | 465 | } |
| 466 | 466 | ||
| 467 | static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status) | 467 | static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status) |