Merge branch 'btrfs-3.0' into for-linus

[~andy/linux] / drivers / net / meth.c

diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index 42e3294671d7fc743c910e19ec20dac33cd2b2fb..60135aa558025bc9f86b434aa5e8b330476dec82 100644 (file)
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -461,7 +461,7 @@ static int meth_tx_full(struct net_device *dev)
 {
        struct meth_private *priv = netdev_priv(dev);
 
-       return (priv->tx_count >= TX_RING_ENTRIES - 1);
+       return priv->tx_count >= TX_RING_ENTRIES - 1;
 }
 
 static void meth_tx_cleanup(struct net_device* dev, unsigned long int_status)