From: Linus Torvalds Date: Thu, 3 Apr 2014 03:53:45 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd6362befe4cc7bf589a5236d2a780af2d47bcc9;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge git://git./linux/kernel/git/davem/net-next Pull networking updates from David Miller: "Here is my initial pull request for the networking subsystem during this merge window: 1) Support for ESN in AH (RFC 4302) from Fan Du. 2) Add full kernel doc for ethtool command structures, from Ben Hutchings. 3) Add BCM7xxx PHY driver, from Florian Fainelli. 4) Export computed TCP rate information in netlink socket dumps, from Eric Dumazet. 5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas Dichtel. 6) Convert many drivers to pci_enable_msix_range(), from Alexander Gordeev. 7) Record SKB timestamps more efficiently, from Eric Dumazet. 8) Switch to microsecond resolution for TCP round trip times, also from Eric Dumazet. 9) Clean up and fix 6lowpan fragmentation handling by making use of the existing inet_frag api for it's implementation. 10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss. 11) Auto size SKB lengths when composing netlink messages based upon past message sizes used, from Eric Dumazet. 12) qdisc dumps can take a long time, add a cond_resched(), From Eric Dumazet. 13) Sanitize netpoll core and drivers wrt. SKB handling semantics. Get rid of never-used-in-tree netpoll RX handling. From Eric W Biederman. 14) Support inter-address-family and namespace changing in VTI tunnel driver(s). From Steffen Klassert. 15) Add Altera TSE driver, from Vince Bridgers. 16) Optimizing csum_replace2() so that it doesn't adjust the checksum by checksumming the entire header, from Eric Dumazet. 17) Expand BPF internal implementation for faster interpreting, more direct translations into JIT'd code, and much cleaner uses of BPF filtering in non-socket ocntexts. From Daniel Borkmann and Alexei Starovoitov" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits) netpoll: Use skb_irq_freeable to make zap_completion_queue safe. net: Add a test to see if a skb is freeable in irq context qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port' net: ptp: move PTP classifier in its own file net: sxgbe: make "core_ops" static net: sxgbe: fix logical vs bitwise operation net: sxgbe: sxgbe_mdio_register() frees the bus Call efx_set_channels() before efx->type->dimension_resources() xen-netback: disable rogue vif in kthread context net/mlx4: Set proper build dependancy with vxlan be2net: fix build dependency on VxLAN mac802154: make csma/cca parameters per-wpan mac802154: allow only one WPAN to be up at any given time net: filter: minor: fix kdoc in __sk_run_filter netlink: don't compare the nul-termination in nla_strcmp can: c_can: Avoid led toggling for every packet. can: c_can: Simplify TX interrupt cleanup can: c_can: Store dlc private can: c_can: Reduce register access can: c_can: Make the code readable ... --- cd6362befe4cc7bf589a5236d2a780af2d47bcc9 diff --cc drivers/staging/wlags49_h2/wl_netdev.c index 77e4be21e44b,69bc0a01ae14..a10d014365f2 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c @@@ -605,105 -626,103 +605,105 @@@ void wl_tx_timeout(struct net_device *d * 1 on error * ******************************************************************************/ -int wl_send( struct wl_private *lp ) +int wl_send(struct wl_private *lp) { - int status; - DESC_STRCT *desc; - WVLAN_LFRAME *txF = NULL; - struct list_head *element; - int len; + int status; + DESC_STRCT *desc; + WVLAN_LFRAME *txF = NULL; + struct list_head *element; + int len; /*------------------------------------------------------------------------*/ - if( lp == NULL ) { - DBG_ERROR( DbgInfo, "Private adapter struct is NULL\n" ); - return FALSE; - } - if( lp->dev == NULL ) { - DBG_ERROR( DbgInfo, "net_device struct in wl_private is NULL\n" ); - return FALSE; - } - - /* Check for the availability of FIDs; if none are available, don't take any - frames off the txQ */ - if( lp->hcfCtx.IFB_RscInd == 0 ) { - return FALSE; - } - - /* Reclaim the TxQ Elements and place them back on the free queue */ - if( !list_empty( &( lp->txQ[0] ))) { - element = lp->txQ[0].next; - - txF = (WVLAN_LFRAME * )list_entry( element, WVLAN_LFRAME, node ); - if( txF != NULL ) { - lp->txF.skb = txF->frame.skb; - lp->txF.port = txF->frame.port; - - txF->frame.skb = NULL; - txF->frame.port = 0; - - list_del( &( txF->node )); - list_add( element, &( lp->txFree )); - - lp->txQ_count--; - - if( lp->txQ_count < TX_Q_LOW_WATER_MARK ) { - if( lp->netif_queue_on == FALSE ) { - DBG_TX( DbgInfo, "Kickstarting Q: %d\n", lp->txQ_count ); - netif_wake_queue( lp->dev ); - WL_WDS_NETIF_WAKE_QUEUE( lp ); - lp->netif_queue_on = TRUE; - } - } - } - } - - if( lp->txF.skb == NULL ) { - return FALSE; - } - - /* If the device has resources (FIDs) available, then Tx the packet */ - /* Format the TxRequest and send it to the adapter */ - len = lp->txF.skb->len < ETH_ZLEN ? ETH_ZLEN : lp->txF.skb->len; - - desc = &( lp->desc_tx ); - desc->buf_addr = lp->txF.skb->data; - desc->BUF_CNT = len; - desc->next_desc_addr = NULL; - - status = hcf_send_msg( &( lp->hcfCtx ), desc, lp->txF.port ); - - if( status == HCF_SUCCESS ) { - lp->dev->trans_start = jiffies; - - DBG_TX( DbgInfo, "Transmit...\n" ); - - if( lp->txF.port == HCF_PORT_0 ) { - lp->stats.tx_packets++; - lp->stats.tx_bytes += lp->txF.skb->len; - } + if (lp == NULL) { + DBG_ERROR(DbgInfo, "Private adapter struct is NULL\n"); + return FALSE; + } + if (lp->dev == NULL) { + DBG_ERROR(DbgInfo, "net_device struct in wl_private is NULL\n"); + return FALSE; + } + + /* + * Check for the availability of FIDs; if none are available, + * don't take any frames off the txQ + */ + if (lp->hcfCtx.IFB_RscInd == 0) + return FALSE; + + /* Reclaim the TxQ Elements and place them back on the free queue */ + if (!list_empty(&(lp->txQ[0]))) { + element = lp->txQ[0].next; + + txF = (WVLAN_LFRAME *) list_entry(element, WVLAN_LFRAME, node); + if (txF != NULL) { + lp->txF.skb = txF->frame.skb; + lp->txF.port = txF->frame.port; + + txF->frame.skb = NULL; + txF->frame.port = 0; + + list_del(&(txF->node)); + list_add(element, &(lp->txFree)); + + lp->txQ_count--; + + if (lp->txQ_count < TX_Q_LOW_WATER_MARK) { + if (lp->netif_queue_on == FALSE) { + DBG_TX(DbgInfo, "Kickstarting Q: %d\n", + lp->txQ_count); + netif_wake_queue(lp->dev); + WL_WDS_NETIF_WAKE_QUEUE(lp); + lp->netif_queue_on = TRUE; + } + } + } + } + + if (lp->txF.skb == NULL) + return FALSE; + + /* If the device has resources (FIDs) available, then Tx the packet */ + /* Format the TxRequest and send it to the adapter */ + len = lp->txF.skb->len < ETH_ZLEN ? ETH_ZLEN : lp->txF.skb->len; + + desc = &(lp->desc_tx); + desc->buf_addr = lp->txF.skb->data; + desc->BUF_CNT = len; + desc->next_desc_addr = NULL; + + status = hcf_send_msg(&(lp->hcfCtx), desc, lp->txF.port); + + if (status == HCF_SUCCESS) { + lp->dev->trans_start = jiffies; + + DBG_TX(DbgInfo, "Transmit...\n"); + if (lp->txF.port == HCF_PORT_0) { + lp->stats.tx_packets++; + lp->stats.tx_bytes += lp->txF.skb->len; + } #ifdef USE_WDS - else - { - lp->wds_port[(( lp->txF.port >> 8 ) - 1)].stats.tx_packets++; - lp->wds_port[(( lp->txF.port >> 8 ) - 1)].stats.tx_bytes += lp->txF.skb->len; - } + else { + lp->wds_port[((lp->txF.port >> 8) - + 1)].stats.tx_packets++; + lp->wds_port[((lp->txF.port >> 8) - + 1)].stats.tx_bytes += lp->txF.skb->len; + } -#endif /* USE_WDS */ +#endif /* USE_WDS */ - /* Free the skb and perform queue cleanup, as the buffer was - transmitted successfully */ - dev_consume_skb_any( lp->txF.skb ); + /* Free the skb and perform queue cleanup, as the buffer was + transmitted successfully */ - dev_kfree_skb(lp->txF.skb); ++ dev_consume_skb_any( lp->txF.skb ); - lp->txF.skb = NULL; - lp->txF.port = 0; - } + lp->txF.skb = NULL; + lp->txF.port = 0; + } + + return TRUE; +} /* wl_send */ - return TRUE; -} // wl_send /*============================================================================*/ /******************************************************************************* @@@ -1715,71 -1695,70 +1715,71 @@@ void wl_wds_netif_carrier_off(struct wl * 1 on error * ******************************************************************************/ -int wl_send_dma( struct wl_private *lp, struct sk_buff *skb, int port ) +int wl_send_dma(struct wl_private *lp, struct sk_buff *skb, int port) { - int len; - DESC_STRCT *desc = NULL; - DESC_STRCT *desc_next = NULL; + int len; + DESC_STRCT *desc = NULL; + DESC_STRCT *desc_next = NULL; /*------------------------------------------------------------------------*/ - if( lp == NULL ) { - DBG_ERROR( DbgInfo, "Private adapter struct is NULL\n" ); - return FALSE; - } + if (lp == NULL) { + DBG_ERROR(DbgInfo, "Private adapter struct is NULL\n"); + return FALSE; + } - if( lp->dev == NULL ) { - DBG_ERROR( DbgInfo, "net_device struct in wl_private is NULL\n" ); - return FALSE; - } + if (lp->dev == NULL) { + DBG_ERROR(DbgInfo, "net_device struct in wl_private is NULL\n"); + return FALSE; + } - /* AGAIN, ALL THE QUEUEING DONE HERE IN I/O MODE IS NOT PERFORMED */ + /* AGAIN, ALL THE QUEUEING DONE HERE IN I/O MODE IS NOT PERFORMED */ - if( skb == NULL ) { - DBG_WARNING (DbgInfo, "Nothing to send.\n"); - return FALSE; - } + if (skb == NULL) { + DBG_WARNING(DbgInfo, "Nothing to send.\n"); + return FALSE; + } - len = skb->len; + len = skb->len; - /* Get a free descriptor */ - desc = wl_pci_dma_get_tx_packet( lp ); + /* Get a free descriptor */ + desc = wl_pci_dma_get_tx_packet(lp); - if( desc == NULL ) { - if( lp->netif_queue_on == TRUE ) { - netif_stop_queue( lp->dev ); - WL_WDS_NETIF_STOP_QUEUE( lp ); - lp->netif_queue_on = FALSE; + if (desc == NULL) { + if (lp->netif_queue_on == TRUE) { + netif_stop_queue(lp->dev); + WL_WDS_NETIF_STOP_QUEUE(lp); + lp->netif_queue_on = FALSE; - dev_kfree_skb(skb); - dev_kfree_skb_any( skb ); - return 0; - } - } ++ dev_kfree_skb_any( skb ); + return 0; + } + } + + SET_BUF_CNT(desc, /*HCF_DMA_FD_CNT */ HFS_ADDR_DEST); + SET_BUF_SIZE(desc, HCF_DMA_TX_BUF1_SIZE); - SET_BUF_CNT( desc, /*HCF_DMA_FD_CNT*/HFS_ADDR_DEST ); - SET_BUF_SIZE( desc, HCF_DMA_TX_BUF1_SIZE ); + desc_next = desc->next_desc_addr; - desc_next = desc->next_desc_addr; + if (desc_next->buf_addr == NULL) { + DBG_ERROR(DbgInfo, "DMA descriptor buf_addr is NULL\n"); + return FALSE; + } - if( desc_next->buf_addr == NULL ) { - DBG_ERROR( DbgInfo, "DMA descriptor buf_addr is NULL\n" ); - return FALSE; - } + /* Copy the payload into the DMA packet */ + memcpy(desc_next->buf_addr, skb->data, len); - /* Copy the payload into the DMA packet */ - memcpy( desc_next->buf_addr, skb->data, len ); + SET_BUF_CNT(desc_next, len); + SET_BUF_SIZE(desc_next, HCF_MAX_PACKET_SIZE); - SET_BUF_CNT( desc_next, len ); - SET_BUF_SIZE( desc_next, HCF_MAX_PACKET_SIZE ); + hcf_dma_tx_put(&(lp->hcfCtx), desc, 0); - hcf_dma_tx_put( &( lp->hcfCtx ), desc, 0 ); + /* Free the skb and perform queue cleanup, as the buffer was + transmitted successfully */ - dev_kfree_skb(skb); ++ dev_consume_skb_any( skb ); - /* Free the skb and perform queue cleanup, as the buffer was - transmitted successfully */ - dev_consume_skb_any( skb ); + return TRUE; +} /* wl_send_dma */ - return TRUE; -} // wl_send_dma /*============================================================================*/ /******************************************************************************* diff --cc include/linux/miscdevice.h index 2cf1547096d9,7bb6148d990f..51e26f3cd3b3 --- a/include/linux/miscdevice.h +++ b/include/linux/miscdevice.h @@@ -23,11 -23,12 +23,12 @@@ #define TEMP_MINOR 131 /* Temperature Sensor */ #define RTC_MINOR 135 #define EFI_RTC_MINOR 136 /* EFI Time services */ + #define VHCI_MINOR 137 #define SUN_OPENPROM_MINOR 139 -#define DMAPI_MINOR 140 /* DMAPI */ +#define DMAPI_MINOR 140 /* unused */ #define NVRAM_MINOR 144 #define SGI_MMTIMER 153 -#define STORE_QUEUE_MINOR 155 +#define STORE_QUEUE_MINOR 155 /* unused */ #define I2O_MINOR 166 #define MICROCODE_MINOR 184 #define VFIO_MINOR 196