From 5648b13d4a79a160549875b32cb50f2c7c241ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Wed, 16 Nov 2011 14:05:33 +0000 Subject: [PATCH] --- yaml --- r: 277584 b: refs/heads/master c: 3ad9b358e03fd9dbf6705721490c811b666b0fe2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/jme.c | 4 ++-- trunk/drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- trunk/drivers/net/ethernet/marvell/sky2.c | 2 +- trunk/drivers/net/xen-netfront.c | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9c92fe6aa910..3414346a9b0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09da71b1212f900cca390d2bffc32b2ae4e4eee2 +refs/heads/master: 3ad9b358e03fd9dbf6705721490c811b666b0fe2 diff --git a/trunk/drivers/net/ethernet/jme.c b/trunk/drivers/net/ethernet/jme.c index df3ab831b1ad..5c0b531949e2 100644 --- a/trunk/drivers/net/ethernet/jme.c +++ b/trunk/drivers/net/ethernet/jme.c @@ -1883,7 +1883,7 @@ jme_fill_tx_map(struct pci_dev *pdev, struct page *page, u32 page_offset, u32 len, - u8 hidma) + bool hidma) { dma_addr_t dmaaddr; @@ -1917,7 +1917,7 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) struct jme_ring *txring = &(jme->txring[0]); struct txdesc *txdesc = txring->desc, *ctxdesc; struct jme_buffer_info *txbi = txring->bufinf, *ctxbi; - u8 hidma = !!(jme->dev->features & NETIF_F_HIGHDMA); + bool hidma = jme->dev->features & NETIF_F_HIGHDMA; int i, nr_frags = skb_shinfo(skb)->nr_frags; int mask = jme->tx_ring_mask; const struct skb_frag_struct *frag; diff --git a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c index 157c5c17fdcc..43e3e6102149 100644 --- a/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/trunk/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -1582,7 +1582,7 @@ static int mv643xx_eth_set_features(struct net_device *dev, netdev_features_t features) { struct mv643xx_eth_private *mp = netdev_priv(dev); - int rx_csum = !!(features & NETIF_F_RXCSUM); + bool rx_csum = features & NETIF_F_RXCSUM; wrlp(mp, PORT_CONFIG, rx_csum ? 0x02000000 : 0x00000000); diff --git a/trunk/drivers/net/ethernet/marvell/sky2.c b/trunk/drivers/net/ethernet/marvell/sky2.c index c79dc5447658..7db6e36ec4f9 100644 --- a/trunk/drivers/net/ethernet/marvell/sky2.c +++ b/trunk/drivers/net/ethernet/marvell/sky2.c @@ -4313,7 +4313,7 @@ static int sky2_set_features(struct net_device *dev, netdev_features_t features) netdev_features_t changed = dev->features ^ features; if (changed & NETIF_F_RXCSUM) { - int on = !!(features & NETIF_F_RXCSUM); + bool on = features & NETIF_F_RXCSUM; sky2_write32(sky2->hw, Q_ADDR(rxqaddr[sky2->port], Q_CSR), on ? BMU_ENA_RX_CHKSUM : BMU_DIS_RX_CHKSUM); } diff --git a/trunk/drivers/net/xen-netfront.c b/trunk/drivers/net/xen-netfront.c index a6e379fbf377..4312db8cdeab 100644 --- a/trunk/drivers/net/xen-netfront.c +++ b/trunk/drivers/net/xen-netfront.c @@ -201,9 +201,9 @@ static void xennet_sysfs_delif(struct net_device *netdev); #define xennet_sysfs_delif(dev) do { } while (0) #endif -static int xennet_can_sg(struct net_device *dev) +static bool xennet_can_sg(struct net_device *dev) { - return !!(dev->features & NETIF_F_SG); + return dev->features & NETIF_F_SG; }