linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the staging tree with the net-next tree
@ 2016-12-07  4:04 Stephen Rothwell
  2016-12-07  7:02 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2016-12-07  4:04 UTC (permalink / raw)
  To: Greg KH, David Miller, Networking; +Cc: linux-next, linux-kernel, Jarod Wilson

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/slicoss/slicoss.c

between commit:

  a52ad514fdf3 ("net: deprecate eth_change_mtu, remove usage")

from the net-next tree and commit:

  0af72df267f2 ("staging: slicoss: remove the staging driver")

from the staging tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2023-10-23  3:47 Stephen Rothwell
  2023-10-23  7:27 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2023-10-23  3:47 UTC (permalink / raw)
  To: Greg KH, David Miller, Jakub Kicinski, Paolo Abeni
  Cc: Networking, Benjamin Poirier, Greg Kroah-Hartman,
	Linux Kernel Mailing List, Linux Next Mailing List,
	Przemek Kitszel

[-- Attachment #1: Type: text/plain, Size: 761 bytes --]

Hi all,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/qlge/qlge_devlink.c

between commit:

  3465915e9985 ("staging: qlge: devlink health: use retained error fmsg API")

from the net-next tree and commit:

  875be090928d ("staging: qlge: Retire the driver")

from the staging tree.

I fixed it up (I just deleted the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2021-08-02 23:33 Mark Brown
  2021-08-03  8:57 ` Phillip Potter
  0 siblings, 1 reply; 29+ messages in thread
From: Mark Brown @ 2021-08-02 23:33 UTC (permalink / raw)
  To: Greg KH
  Cc: David S . Miller, Greg Kroah-Hartman, Linux Kernel Mailing List,
	Linux Next Mailing List, Arnd Bergmann, Phillip Potter

Hi all,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/r8188eu/include/rtw_android.h
  drivers/staging/r8188eu/os_dep/rtw_android.c

between commit:

  89939e890605 ("staging: rtlwifi: use siocdevprivate")

from the net-next tree and commit:

  2b42bd58b321 ("staging: r8188eu: introduce new os_dep dir for RTL8188eu driver")

from the staging tree.

I fixed it up using the net-next version and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2019-02-28  4:52 Stephen Rothwell
  2019-02-28  7:04 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2019-02-28  4:52 UTC (permalink / raw)
  To: Greg KH, David Miller, Networking
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Florian Fainelli

[-- Attachment #1: Type: text/plain, Size: 805 bytes --]

Hi all,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/fsl-dpaa2/ethsw/ethsw.c

between commit:

  570b68c8ddde ("staging: fsl-dpaa2: ethsw: Handle SWITCHDEV_PORT_ATTR_SET")

from the net-next tree and commit:

  11f27765f611 ("staging: fsl-dpaa2: ethsw: Add missing netdevice check")

from the staging tree.

I fixed it up (the former is a superset of the latter) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging.  You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2018-03-15  7:35 Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2018-03-15  7:35 UTC (permalink / raw)
  To: Greg KH, David Miller, Networking
  Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Denys Vlasenko

[-- Attachment #1: Type: text/plain, Size: 800 bytes --]

Hi all,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/irda/net/af_irda.c

between commit:

  9b2c45d479d0 ("net: make getname() functions return length rather than use int* parameter")

from the net-next tree and commit:

  d64c2a76123f ("staging: irda: remove the irda network stack and drivers")

from the staging tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2016-11-24  3:42 Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2016-11-24  3:42 UTC (permalink / raw)
  To: Greg KH, David Miller, Networking
  Cc: linux-next, linux-kernel, Jarod Wilson, Erik Arfvidson, David Kershner

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/unisys/include/iochannel.h

between commit:

  d0c2c9973ecd ("net: use core MTU range checking in virt drivers")

from the net-next tree and commit:

  b18f9c676f93 ("staging: unisys: include: fix pound defines")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/staging/unisys/include/iochannel.h
index 9081b3f8779c,c43da782f37e..000000000000
--- a/drivers/staging/unisys/include/iochannel.h
+++ b/drivers/staging/unisys/include/iochannel.h
@@@ -113,10 -117,12 +117,10 @@@ enum net_types 
  
  };
  
- #define		ETH_MIN_DATA_SIZE 46	/* minimum eth data size */
- #define		ETH_MIN_PACKET_SIZE (ETH_HLEN + ETH_MIN_DATA_SIZE)
 -#define ETH_HEADER_SIZE 14	/* size of ethernet header */
 -
+ #define ETH_MIN_DATA_SIZE 46	/* minimum eth data size */
 -#define ETH_MIN_PACKET_SIZE (ETH_HEADER_SIZE + ETH_MIN_DATA_SIZE)
++#define ETH_MIN_PACKET_SIZE (ETH_HLEN + ETH_MIN_DATA_SIZE)
  
- #define		VISOR_ETH_MAX_MTU 16384	/* maximum data size */
 -#define ETH_MAX_MTU 16384	/* maximum data size */
++#define VISOR_ETH_MAX_MTU 16384	/* maximum data size */
  
  #ifndef MAX_MACADDR_LEN
  #define MAX_MACADDR_LEN 6	/* number of bytes in MAC address */
@@@ -286,9 -304,9 +302,9 @@@ struct net_pkt_xmt 
  	int len;	/* full length of data in the packet */
  	int num_frags;	/* number of fragments in frags containing data */
  	struct phys_info frags[MAX_PHYS_INFO];	/* physical page information */
 -	char ethhdr[ETH_HEADER_SIZE];	/* the ethernet header  */
 +	char ethhdr[ETH_HLEN];	/* the ethernet header  */
  	struct {
- 		/* these are needed for csum at uisnic end */
+ 		/* These are needed for csum at uisnic end */
  		u8 valid;	/* 1 = struct is valid - else ignore */
  		u8 hrawoffv;	/* 1 = hwrafoff is valid */
  		u8 nhrawoffv;	/* 1 = nhwrafoff is valid */
@@@ -321,29 -341,41 +339,41 @@@ struct net_pkt_xmtdone 
   */
  #define RCVPOST_BUF_SIZE 4032
  #define MAX_NET_RCV_CHAIN \
 -	((ETH_MAX_MTU + ETH_HEADER_SIZE + RCVPOST_BUF_SIZE - 1) \
 +	((VISOR_ETH_MAX_MTU + ETH_HLEN + RCVPOST_BUF_SIZE - 1) \
  	/ RCVPOST_BUF_SIZE)
  
+ /*
+  * rcv buf size must be large enough to include ethernet data len + ethernet
+  * header len - we are choosing 2K because it is guaranteed to be describable.
+  */
  struct net_pkt_rcvpost {
- 	    /* rcv buf size must be large enough to include ethernet data len +
- 	     * ethernet header len - we are choosing 2K because it is guaranteed
- 	     * to be describable
- 	     */
- 	    struct phys_info frag;	/* physical page information for the */
- 					/* single fragment 2K rcv buf */
- 	    u64 unique_num;
- 	    /* unique_num ensure that receive posts are returned to */
- 	    /* the Adapter which we sent them originally. */
+ 	/* Physical page information for the single fragment 2K rcv buf */
+ 	struct phys_info frag;
+ 
+ 	/*
+ 	 * Ensures that receive posts are returned to the adapter which we sent
+ 	 * them from originally.
+ 	 */
+ 	u64 unique_num;
+ 
  } __packed;
  
+ /*
+  * The number of rcvbuf that can be chained is based on max mtu and size of each
+  * rcvbuf.
+  */
  struct net_pkt_rcv {
- 	/* the number of receive buffers that can be chained  */
- 	/* is based on max mtu and size of each rcv buf */
- 	u32 rcv_done_len;	/* length of received data */
- 	u8 numrcvbufs;		/* number of receive buffers that contain the */
- 	/* incoming data; guest end MUST chain these together. */
- 	void *rcvbuf[MAX_NET_RCV_CHAIN];	/* list of chained rcvbufs */
- 	/* each entry is a receive buffer provided by NET_RCV_POST. */
+ 	u32 rcv_done_len; /* length of received data */
+ 
+ 	/*
+ 	 * numrcvbufs: contain the incoming data; guest side MUST chain these
+ 	 * together.
+ 	 */
+ 	u8 numrcvbufs;
+ 
+ 	void *rcvbuf[MAX_NET_RCV_CHAIN]; /* list of chained rcvbufs */
+ 
+ 	/* Each entry is a receive buffer provided by NET_RCV_POST. */
  	/* NOTE: first rcvbuf in the chain will also be provided in net.buf. */
  	u64 unique_num;
  	u32 rcvs_dropped_delta;

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2016-10-21  1:21 Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2016-10-21  1:21 UTC (permalink / raw)
  To: Greg KH, David Miller, Networking
  Cc: linux-next, linux-kernel, Jarod Wilson, Sergio Paracuellos

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

  drivers/staging/wlan-ng/p80211netdev.c

between commit:

  9c22b4a34edd ("net: use core MTU range checking in wireless drivers")

from the net-next tree and commit:

  84ad1efa7d2b ("staging: wlan-ng: fix block comment warnings in p80211netdev.c")

from the staging tree.

I fixed it up (the former removed the code updates by the latter, so I
just did that) and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2014-07-16  6:43 Stephen Rothwell
  2014-07-16 20:52 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2014-07-16  6:43 UTC (permalink / raw)
  To: Greg KH, David Miller, netdev
  Cc: linux-next, linux-kernel, Tom Gundersen, Kristina Martšenko

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/cxt1e1/linux.c between commit c835a6773314 ("net: set
name_assign_type in alloc_netdev()") from the net-next tree and commit
14b596c9d80b ("staging: cxt1e1: remove driver") from the staging tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2014-05-28  8:28 Stephen Rothwell
  2014-05-28 15:49 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2014-05-28  8:28 UTC (permalink / raw)
  To: Greg KH, David Miller, netdev, John W. Linville
  Cc: linux-next, linux-kernel, Emmanuel Grumbach, Johannes Berg, Sachin Kamat

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8821ae/core.c between commit 77be2c54c5bd
("mac80211: add vif to flush call") from the net-next tree and commit
0cd05ba54a53 ("staging: rtl8821ae: core.c: Remove version specific
code") from the staging tree.

I fixed it up (the former is a suberset of the latter for this
particular conflict) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2014-03-27  5:09 Stephen Rothwell
  2014-03-27 19:14 ` Eric W. Biederman
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2014-03-27  5:09 UTC (permalink / raw)
  To: Greg KH, David Miller, netdev
  Cc: linux-next, linux-kernel, Eric W. Biederman, Mathieu Maret,
	Jelena Bjelja

[-- Attachment #1: Type: text/plain, Size: 10620 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/wlags49_h2/wl_netdev.c between commit 8d4ade284a41
("wlags49_h2: Call dev_kfree/consume_skb_any instead of dev_kfree_skb")
from the net-next tree and commit fed3ffd8f7ef ("staging: wlags49_h2:
reindent wl_netdev.c") (and maybe others) from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/wlags49_h2/wl_netdev.c
index 69bc0a01ae14,77e4be21e44b..000000000000
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@@ -626,103 -605,105 +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
  /*============================================================================*/
  
  /*******************************************************************************
@@@ -1695,70 -1715,71 +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_any( skb );
-             return 0;
-         }
-     }
 -			dev_kfree_skb(skb);
++			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
  /*============================================================================*/
  
  /*******************************************************************************

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2014-03-17  8:08 Stephen Rothwell
  2014-03-17 18:30 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2014-03-17  8:08 UTC (permalink / raw)
  To: Greg KH, David Miller, netdev
  Cc: linux-next, linux-kernel, John W. Linville, Zhao, Gang

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/wlan-ng/cfg80211.c between commit 3ead0d2e220e ("wlan-ng:
fixup staging driver for removal of ieee80211_dsss_chan_to_freq") from
the net-next tree and commit 4e5e9d7c66f0 ("staging: wlan-ng: replace
function ieee80211_dsss_chan_to_freq()") from the staging tree.

I fixed it up (I used the staging tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2013-05-29  4:14 Stephen Rothwell
  2013-05-29  8:03 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2013-05-29  4:14 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Jiri Pirko, David Miller, netdev,
	"Tülin İzer"

[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/silicom/bpctl_mod.c between commit 351638e7deee ("net:
pass info struct via netdevice notifier") from the net-next tree and
commit f84b075178b4 ("Staging: silicom: Fixed error 'do not initialise
statics to 0 or NULL'") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/silicom/bpctl_mod.c
index c8ddb99,3082ba9..0000000
--- a/drivers/staging/silicom/bpctl_mod.c
+++ b/drivers/staging/silicom/bpctl_mod.c
@@@ -133,8 -133,8 +133,8 @@@ static unsigned long str_to_hex(char *p
  static int bp_device_event(struct notifier_block *unused,
  			   unsigned long event, void *ptr)
  {
 -	struct net_device *dev = ptr;
 +	struct net_device *dev = netdev_notifier_info_to_dev(ptr);
- 	static bpctl_dev_t *pbpctl_dev = NULL, *pbpctl_dev_m = NULL;
+ 	static bpctl_dev_t *pbpctl_dev, *pbpctl_dev_m;
  	int dev_num = 0, ret = 0, ret_d = 0, time_left = 0;
  	/* printk("BP_PROC_SUPPORT event =%d %s %d\n", event,dev->name, dev->ifindex ); */
  	/* return NOTIFY_DONE; */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2013-01-23  4:45 Stephen Rothwell
  2013-01-23  4:52 ` Greg KH
  0 siblings, 1 reply; 29+ messages in thread
From: Stephen Rothwell @ 2013-01-23  4:45 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Florian Fainelli, David Miller, netdev,
	Mark Einon

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et131x.c between commit f9a8f83b04e0 ("net: phy:
remove flags argument from phy_{attach, connect, connect_direct}") from
the net-next tree and commit 26ef1021c1c7 ("staging: et131x: Modify block
comments to fit with networking style") from the staging tree.

I fixed it up (the former adjusted the white space in the same was as the
latter, so I used thet) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
* linux-next: manual merge of the staging tree with the net-next tree
@ 2011-10-25  8:26 Stephen Rothwell
  0 siblings, 0 replies; 29+ messages in thread
From: Stephen Rothwell @ 2011-10-25  8:26 UTC (permalink / raw)
  To: Greg KH
  Cc: linux-next, linux-kernel, Jiri Pirko, Ian Campbell, David Miller,
	netdev, Mark Einon

[-- Attachment #1: Type: text/plain, Size: 703 bytes --]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et1310_tx.c drivers/staging/et131x/et131x_netdev.c
between commits afc4b13df143 ("net: remove use of ndo_set_multicast_list
in drivers"), bf3f1a6081aa ("et131x: convert to SKB paged frag API") and
5d6bcdfe38ce ("net: use DMA_x_DEVICE and dma_mapping_error with
skb_frag_dma_map") from the net-next tree and commit d2796743cba2
("staging: et131x: Put all .c files into one big file") from the staging
tree.

The latter removed these files, so I did that but more fixup is proably
needed.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 29+ messages in thread
end of thread, other threads:[~2023-10-23  7:28 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-07  4:04 linux-next: manual merge of the staging tree with the net-next tree Stephen Rothwell
2016-12-07  7:02 ` Greg KH
  -- strict thread matches above, loose matches on Subject: below --
2023-10-23  3:47 Stephen Rothwell
2023-10-23  7:27 ` Greg KH
2021-08-02 23:33 Mark Brown
2021-08-03  8:57 ` Phillip Potter
2021-08-03  9:23   ` Arnd Bergmann
2021-08-09  7:55     ` Stephen Rothwell
2021-08-09 12:46       ` Phillip Potter
2021-08-09 20:00         ` Arnd Bergmann
2021-08-09 21:45           ` Phillip Potter
2019-02-28  4:52 Stephen Rothwell
2019-02-28  7:04 ` Greg KH
2018-03-15  7:35 Stephen Rothwell
2016-11-24  3:42 Stephen Rothwell
2016-10-21  1:21 Stephen Rothwell
2014-07-16  6:43 Stephen Rothwell
2014-07-16 20:52 ` Greg KH
2014-05-28  8:28 Stephen Rothwell
2014-05-28 15:49 ` Greg KH
2014-03-27  5:09 Stephen Rothwell
2014-03-27 19:14 ` Eric W. Biederman
2014-03-17  8:08 Stephen Rothwell
2014-03-17 18:30 ` Greg KH
2013-05-29  4:14 Stephen Rothwell
2013-05-29  8:03 ` Greg KH
2013-01-23  4:45 Stephen Rothwell
2013-01-23  4:52 ` Greg KH
2011-10-25  8:26 Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).