diff options
Diffstat (limited to 'drivers/net/ethernet/jme.c')
-rw-r--r-- | drivers/net/ethernet/jme.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index 7becff1f387d..5c0b531949e2 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c | |||
@@ -1883,7 +1883,7 @@ jme_fill_tx_map(struct pci_dev *pdev, | |||
1883 | struct page *page, | 1883 | struct page *page, |
1884 | u32 page_offset, | 1884 | u32 page_offset, |
1885 | u32 len, | 1885 | u32 len, |
1886 | u8 hidma) | 1886 | bool hidma) |
1887 | { | 1887 | { |
1888 | dma_addr_t dmaaddr; | 1888 | dma_addr_t dmaaddr; |
1889 | 1889 | ||
@@ -1917,7 +1917,7 @@ jme_map_tx_skb(struct jme_adapter *jme, struct sk_buff *skb, int idx) | |||
1917 | struct jme_ring *txring = &(jme->txring[0]); | 1917 | struct jme_ring *txring = &(jme->txring[0]); |
1918 | struct txdesc *txdesc = txring->desc, *ctxdesc; | 1918 | struct txdesc *txdesc = txring->desc, *ctxdesc; |
1919 | struct jme_buffer_info *txbi = txring->bufinf, *ctxbi; | 1919 | struct jme_buffer_info *txbi = txring->bufinf, *ctxbi; |
1920 | u8 hidma = jme->dev->features & NETIF_F_HIGHDMA; | 1920 | bool hidma = jme->dev->features & NETIF_F_HIGHDMA; |
1921 | int i, nr_frags = skb_shinfo(skb)->nr_frags; | 1921 | int i, nr_frags = skb_shinfo(skb)->nr_frags; |
1922 | int mask = jme->tx_ring_mask; | 1922 | int mask = jme->tx_ring_mask; |
1923 | const struct skb_frag_struct *frag; | 1923 | const struct skb_frag_struct *frag; |
@@ -2292,9 +2292,9 @@ jme_get_drvinfo(struct net_device *netdev, | |||
2292 | { | 2292 | { |
2293 | struct jme_adapter *jme = netdev_priv(netdev); | 2293 | struct jme_adapter *jme = netdev_priv(netdev); |
2294 | 2294 | ||
2295 | strcpy(info->driver, DRV_NAME); | 2295 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); |
2296 | strcpy(info->version, DRV_VERSION); | 2296 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
2297 | strcpy(info->bus_info, pci_name(jme->pdev)); | 2297 | strlcpy(info->bus_info, pci_name(jme->pdev), sizeof(info->bus_info)); |
2298 | } | 2298 | } |
2299 | 2299 | ||
2300 | static int | 2300 | static int |
@@ -2620,8 +2620,8 @@ jme_set_msglevel(struct net_device *netdev, u32 value) | |||
2620 | jme->msg_enable = value; | 2620 | jme->msg_enable = value; |
2621 | } | 2621 | } |
2622 | 2622 | ||
2623 | static u32 | 2623 | static netdev_features_t |
2624 | jme_fix_features(struct net_device *netdev, u32 features) | 2624 | jme_fix_features(struct net_device *netdev, netdev_features_t features) |
2625 | { | 2625 | { |
2626 | if (netdev->mtu > 1900) | 2626 | if (netdev->mtu > 1900) |
2627 | features &= ~(NETIF_F_ALL_TSO | NETIF_F_ALL_CSUM); | 2627 | features &= ~(NETIF_F_ALL_TSO | NETIF_F_ALL_CSUM); |
@@ -2629,7 +2629,7 @@ jme_fix_features(struct net_device *netdev, u32 features) | |||
2629 | } | 2629 | } |
2630 | 2630 | ||
2631 | static int | 2631 | static int |
2632 | jme_set_features(struct net_device *netdev, u32 features) | 2632 | jme_set_features(struct net_device *netdev, netdev_features_t features) |
2633 | { | 2633 | { |
2634 | struct jme_adapter *jme = netdev_priv(netdev); | 2634 | struct jme_adapter *jme = netdev_priv(netdev); |
2635 | 2635 | ||