Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index a193884..8ea0b4e 100644 (file)
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -834,14 +834,13 @@ static int lan743x_mac_init(struct lan743x_adapter *adapter)
 
 static int lan743x_mac_open(struct lan743x_adapter *adapter)
 {
-       int ret = 0;
        u32 temp;
 
        temp = lan743x_csr_read(adapter, MAC_RX);
        lan743x_csr_write(adapter, MAC_RX, temp | MAC_RX_RXEN_);
        temp = lan743x_csr_read(adapter, MAC_TX);
        lan743x_csr_write(adapter, MAC_TX, temp | MAC_TX_TXEN_);
-       return ret;
+       return 0;
 }
 
 static void lan743x_mac_close(struct lan743x_adapter *adapter)

diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
index f5d48d7..da48dd8 100644 (file)
--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
@@ -1121,7 +1121,7 @@ static void __vxge_hw_blockpool_destroy(struct __vxge_hw_blockpool *blockpool)
 
        list_for_each_safe(p, n, &blockpool->free_entry_list) {
                list_del(&((struct __vxge_hw_blockpool_entry *)p)->item);
-               kfree((void *)p);
+               kfree(p);
        }
 
        return;

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index fe2296f..5d8c015 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -2515,9 +2515,10 @@ int phylink_mii_c22_pcs_config(struct mdio_device *pcs, unsigned int mode,
 
        changed = ret > 0;
 
+       /* Ensure ISOLATE bit is disabled */
        bmcr = mode == MLO_AN_INBAND ? BMCR_ANENABLE : 0;
        ret = mdiobus_modify(pcs->bus, pcs->addr, MII_BMCR,
-                            BMCR_ANENABLE, bmcr);
+                            BMCR_ANENABLE | BMCR_ISOLATE, bmcr);
        if (ret < 0)
                return ret;
 

diff --git a/net/core/dev.c b/net/core/dev.c
index 82dc6b4..9e7f071 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3206,7 +3206,7 @@ int skb_checksum_help(struct sk_buff *skb)
        if (skb->ip_summed == CHECKSUM_COMPLETE)
                goto out_set_summed;
 
-       if (unlikely(skb_shinfo(skb)->gso_size)) {
+       if (unlikely(skb_is_gso(skb))) {
                skb_warn_bad_offload(skb);
                return -EINVAL;
        }