On 04/10/2014 07:27 PM, Greg KH wrote: > On Thu, Apr 10, 2014 at 06:56:01PM -0400, Marcos A. Di Pietro wrote: >> On 04/10/2014 04:55 PM, Greg KH wrote: >>> On Thu, Apr 10, 2014 at 04:22:13PM -0400, Marcos A. Di Pietro wrote: >>>> On 04/10/2014 04:14 PM, Greg KH wrote: >>>>> On Tue, Mar 25, 2014 at 01:55:47PM -0400, Marcos A. Di Pietro wrote: >>>>>> Fixes code style errors in drivers/staging/bcm/Qos.c >>>>>> >>>>>> Patch submitted as part of the Eudyptula Challenge. >>>>>> >>>>>> Signed-off-by: Marcos A. Di Pietro <marcos...@gmail.com> >>>>>> --- >>>>>> drivers/staging/bcm/Qos.c | 13 ++++++++----- >>>>>> 1 file changed, 8 insertions(+), 5 deletions(-) >>>>>> >>>>>> diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c >>>>>> index 4f31583..e7fccbc 100644 >>>>>> --- a/drivers/staging/bcm/Qos.c >>>>>> +++ b/drivers/staging/bcm/Qos.c >>>>>> @@ -4,11 +4,14 @@ This file contains the routines related to Quality of >>>>>> Service. >>>>>> */ >>>>>> #include "headers.h" >>>>>> >>>>>> -static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, PVOID >>>>>> pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); >>>>>> -static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct >>>>>> sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo, struct >>>>>> bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport); >>>>>> - >>>>>> -static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct >>>>>> iphdr *iphd, >>>>>> - struct bcm_classifier_rule >>>>>> *pstClassifierRule); >>>>>> +static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, >>>>>> + PVOID pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); >>>>>> +static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, >>>>>> + struct sk_buff *skb, struct bcm_eth_packet_info *pstEthCsPktInfo, >>>>>> + struct bcm_classifier_rule *pstClassifierRule, B_UINT8 >>>>>> EthCSCupport); >>>>>> + >>>>>> +static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr >>>>>> *iphd, >>>>>> + struct bcm_classifier_rule *pstClassifierRule); >>>>>> >>>>>> static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex); >>>>> >>>>> For some reason this patch doesn't apply at all to my tree, can you redo >>>>> it and resend? >>>>> >>>>> thanks, >>>>> >>>>> greg k-h >>>>> >>>> >>>> Which tree are you using? Is there a way I could pull from a tree that >>>> best resembles yours? >>> >>> Try it against Linus's tree right now, that's where I tried to apply it >>> as my tree is "empty" right now. >>> >>> thanks, >>> >>> greg k-h >>> >> >> >From 6e6efa45b862042e30308dc9512a5af877c53f2a Mon Sep 17 00:00:00 2001 >> From: "Marcos A. Di Pietro" <marcos...@gmail.com> >> Date: Thu, 10 Apr 2014 18:33:21 -0400 >> Subject: [PATCH 1/1] Fixes code style errors in drivers/staging/bcm/Qos.c >> >> Patch submitted as part of the Eudyptula Challenge. >> >> Signed-off-by: Marcos A. Di Pietro <marcos...@gmail.com> > > Why add this to the end of an email? I need a "fresh" email in order to > not have to edit this by hand :( > >> --- >> drivers/staging/bcm/Qos.c | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c >> index 4f31583..b64d0b6 100644 >> --- a/drivers/staging/bcm/Qos.c >> +++ b/drivers/staging/bcm/Qos.c >> @@ -4,11 +4,15 @@ This file contains the routines related to Quality of >> Service. >> */ >> #include "headers.h" >> >> -static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, PVOID >> pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); > > That's pretty obviously not going to apply properly, you have line-wrapp > on. You can't cut-and-paste patches into gmail, see > Documentation/email_clients.txt for details. > > thanks, > > greg k-h > I'm so sorry about that. I already read it and configured Thunderbird as recommended. I just forgot to turn line wrap off. Let's try it again.
>From 6e6efa45b862042e30308dc9512a5af877c53f2a Mon Sep 17 00:00:00 2001 From: "Marcos A. Di Pietro" <marcos...@gmail.com> Date: Thu, 10 Apr 2014 18:33:21 -0400 Subject: [PATCH 1/1] Fixes code style errors in drivers/staging/bcm/Qos.c Patch submitted as part of the Eudyptula Challenge. Signed-off-by: Marcos A. Di Pietro <marcos...@gmail.com> --- drivers/staging/bcm/Qos.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 4f31583..b64d0b6 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -4,11 +4,15 @@ This file contains the routines related to Quality of Service. */ #include "headers.h" -static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, PVOID pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); -static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, struct sk_buff* skb, struct bcm_eth_packet_info *pstEthCsPktInfo, struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport); +static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter, + PVOID pvEthPayload, struct bcm_eth_packet_info *pstEthCsPktInfo); + +static bool EThCSClassifyPkt(struct bcm_mini_adapter *Adapter, + struct sk_buff *skb, struct bcm_eth_packet_info *pstEthCsPktInfo, + struct bcm_classifier_rule *pstClassifierRule, B_UINT8 EthCSCupport); static USHORT IpVersion4(struct bcm_mini_adapter *Adapter, struct iphdr *iphd, - struct bcm_classifier_rule *pstClassifierRule); + struct bcm_classifier_rule *pstClassifierRule); static VOID PruneQueue(struct bcm_mini_adapter *Adapter, INT iIndex); -- 1.8.3.2 _______________________________________________ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
