linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/6] staging: wlan-ng: Fixed block comment coding style
@ 2016-01-08 18:59 Pranjal Bhor
  2016-01-09  4:28 ` Sudip Mukherjee
  0 siblings, 1 reply; 5+ messages in thread
From: Pranjal Bhor @ 2016-01-08 18:59 UTC (permalink / raw)
  To: gregkh; +Cc: devel, linux-kernel, Pranjal Bhor

Block comments now end with '*/' on a newline and all lines
of block comments now begin with '*'

Signed-off-by: Pranjal Bhor <bhor.pranjal@gmail.com>
---
 drivers/staging/wlan-ng/p80211conv.c | 37 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 1b02cdf..8175f17 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -49,7 +49,8 @@
 *
 * --------------------------------------------------------------------
 *
-*================================================================ */
+*================================================================
+*/

 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -101,7 +102,8 @@ static u8 oui_8021h[] = { 0x00, 0x00, 0xf8 };
 *
 * Call context:
 *	May be called in interrupt or non-interrupt context
-----------------------------------------------------------------*/
+*----------------------------------------------------------------
+*/
 int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,
			struct sk_buff *skb, union p80211_hdr *p80211_hdr,
			struct p80211_metawep *p80211_wep)
@@ -238,7 +240,8 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
	int i;

	/* Gather wireless spy statistics: for each packet, compare the
-	 * source address with out list, and if match, get the stats... */
+	 * source address with out list, and if match, get the stats...
+	 */

	for (i = 0; i < wlandev->spy_number; i++) {

@@ -273,7 +276,8 @@ static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac,
 *
 * Call context:
 *	May be called in interrupt or non-interrupt context
-----------------------------------------------------------------*/
+*----------------------------------------------------------------
+*/
 int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
			struct sk_buff *skb)
 {
@@ -421,7 +425,8 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
		&& (e_llc->ctl == 0x03)) {
		pr_debug("802.1h/RFC1042 len: %d\n", payload_length);
		/* it's an 802.1h frame || (an RFC1042 && protocol not in STT)
-		   build a DIXII + RFC894 */
+		 * build a DIXII + RFC894
+		 */

		/* Test for an overlength frame */
		if ((payload_length - sizeof(struct wlan_llc) -
@@ -521,14 +526,15 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
 *
 * Call context:
 *	May be called in interrupt or non-interrupt context
-----------------------------------------------------------------*/
+*----------------------------------------------------------------
+*/
 int p80211_stt_findproto(u16 proto)
 {
-	/* Always return found for now.  This is the behavior used by the */
-	/*  Zoom Win95 driver when 802.1h mode is selected */
-	/* TODO: If necessary, add an actual search we'll probably
-	   need this to match the CMAC's way of doing things.
-	   Need to do some testing to confirm.
+	/* Always return found for now.  This is the behavior used by the
+	 * Zoom Win95 driver when 802.1h mode is selected
+	 * TODO: If necessary, add an actual search we'll probably
+	 * need this to match the CMAC's way of doing things.
+	 * Need to do some testing to confirm.
	 */

	if (proto == ETH_P_AARP)	/* APPLETALK */
@@ -551,7 +557,8 @@ int p80211_stt_findproto(u16 proto)
 *
 * Call context:
 *	May be called in interrupt or non-interrupt context
-----------------------------------------------------------------*/
+*----------------------------------------------------------------
+*/
 void p80211skb_rxmeta_detach(struct sk_buff *skb)
 {
	struct p80211_rxmeta *rxmeta;
@@ -595,7 +602,8 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb)
 *
 * Call context:
 *	May be called in interrupt or non-interrupt context
-----------------------------------------------------------------*/
+*----------------------------------------------------------------
+*/
 int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb)
 {
	int result = 0;
@@ -648,7 +656,8 @@ exit:
 *
 * Call context:
 *	May be called in interrupt or non-interrupt context
-----------------------------------------------------------------*/
+*----------------------------------------------------------------
+*/
 void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb)
 {
	struct p80211_frmmeta *meta;
--
1.9.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/6] staging: wlan-ng: Fixed block comment coding style
  2016-01-08 18:59 [PATCH 1/6] staging: wlan-ng: Fixed block comment coding style Pranjal Bhor
@ 2016-01-09  4:28 ` Sudip Mukherjee
  2016-01-09  5:53   ` Pranjal
  0 siblings, 1 reply; 5+ messages in thread
From: Sudip Mukherjee @ 2016-01-09  4:28 UTC (permalink / raw)
  To: Pranjal Bhor; +Cc: gregkh, devel, linux-kernel

On Sat, Jan 09, 2016 at 12:29:21AM +0530, Pranjal Bhor wrote:
> Block comments now end with '*/' on a newline and all lines
> of block comments now begin with '*'
> 
> Signed-off-by: Pranjal Bhor <bhor.pranjal@gmail.com>
> ---

something is wrong, when I am trying to test the patch, it is not
applying and git says patch is corrupt.

regards
sudip

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/6] staging: wlan-ng: Fixed block comment coding style
  2016-01-09  4:28 ` Sudip Mukherjee
@ 2016-01-09  5:53   ` Pranjal
  2016-01-11  8:21     ` Sudip Mukherjee
  0 siblings, 1 reply; 5+ messages in thread
From: Pranjal @ 2016-01-09  5:53 UTC (permalink / raw)
  To: Sudip Mukherjee; +Cc: gregkh, devel, linux-kernel



On Saturday 09 January 2016 09:58 AM, Sudip Mukherjee wrote:
> On Sat, Jan 09, 2016 at 12:29:21AM +0530, Pranjal Bhor wrote:
>> Block comments now end with '*/' on a newline and all lines
>> of block comments now begin with '*'
>>
>> Signed-off-by: Pranjal Bhor <bhor.pranjal@gmail.com>
>> ---
> something is wrong, when I am trying to test the patch, it is not
> applying and git says patch is corrupt.
>
> regards
> sudip
I have checked it once again but everything seems to be fine. How can I 
reproduce your result?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/6] staging: wlan-ng: Fixed block comment coding style
  2016-01-09  5:53   ` Pranjal
@ 2016-01-11  8:21     ` Sudip Mukherjee
  2016-01-12 11:11       ` Dan Carpenter
  0 siblings, 1 reply; 5+ messages in thread
From: Sudip Mukherjee @ 2016-01-11  8:21 UTC (permalink / raw)
  To: Pranjal; +Cc: gregkh, devel, linux-kernel

On Sat, Jan 09, 2016 at 11:23:14AM +0530, Pranjal wrote:
> 
> 
> On Saturday 09 January 2016 09:58 AM, Sudip Mukherjee wrote:
> >On Sat, Jan 09, 2016 at 12:29:21AM +0530, Pranjal Bhor wrote:
> >>Block comments now end with '*/' on a newline and all lines
> >>of block comments now begin with '*'
> >>
> >>Signed-off-by: Pranjal Bhor <bhor.pranjal@gmail.com>
> >>---
> >something is wrong, when I am trying to test the patch, it is not
> >applying and git says patch is corrupt.
> >
> >regards
> >sudip
> I have checked it once again but everything seems to be fine. How
> can I reproduce your result?

Sorry for the late reply. Please try to apply the patch that you have
sent.

regards
sudip

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/6] staging: wlan-ng: Fixed block comment coding style
  2016-01-11  8:21     ` Sudip Mukherjee
@ 2016-01-12 11:11       ` Dan Carpenter
  0 siblings, 0 replies; 5+ messages in thread
From: Dan Carpenter @ 2016-01-12 11:11 UTC (permalink / raw)
  To: Sudip Mukherjee; +Cc: Pranjal, devel, gregkh, linux-kernel

Weird...  It applies with patch but not with git am.

Read the first paragraph of Documentation/email-clients.txt

`cat raw_email.txt | git am`

regards,
dan carpenter

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-01-12 11:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-08 18:59 [PATCH 1/6] staging: wlan-ng: Fixed block comment coding style Pranjal Bhor
2016-01-09  4:28 ` Sudip Mukherjee
2016-01-09  5:53   ` Pranjal
2016-01-11  8:21     ` Sudip Mukherjee
2016-01-12 11:11       ` Dan Carpenter

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).