2014-07-16 11:28:27

by Kiran Padwal

Subject: [PATCH] Staging: gdm724x: fix missing blank line after variable declaration

From: Kiran Padwal <[email protected]>

Checkpatch fix - Add missing blank line after variable declaration

Signed-off-by:Kiran Padwal <[email protected]>

---
drivers/staging/gdm724x/gdm_lte.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/staging/gdm724x/gdm_lte.c b/drivers/staging/gdm724x/gdm_lte.c
index 64c55b9..bc6d574 100644
--- a/drivers/staging/gdm724x/gdm_lte.c
+++ b/drivers/staging/gdm724x/gdm_lte.c
@@ -447,6 +447,7 @@ static int gdm_lte_tx(struct sk_buff *skb, struct net_device *dev)
*/
if (nic_type & NIC_TYPE_F_VLAN) {
struct vlan_ethhdr *vlan_eth = (struct vlan_ethhdr *)skb->data;
+
nic->vlan_id = ntohs(vlan_eth->h_vlan_TCI) & VLAN_VID_MASK;
data_buf = skb->data + (VLAN_ETH_HLEN - ETH_HLEN);
data_len = skb->len - (VLAN_ETH_HLEN - ETH_HLEN);
@@ -505,6 +506,7 @@ static int gdm_lte_tx(struct sk_buff *skb, struct net_device *dev)
static struct net_device_stats *gdm_lte_stats(struct net_device *dev)
{
struct nic *nic = netdev_priv(dev);
+
return &nic->stats;
}

--
1.7.9.5

2014-07-16 20:30:37

by Greg Kroah-Hartman

Subject: Re: [PATCH] Staging: gdm724x: fix missing blank line after variable declaration

On Wed, Jul 16, 2014 at 04:55:23PM +0530, Kiran Padwal wrote:
> From: Kiran Padwal <[email protected]>
>
> Checkpatch fix - Add missing blank line after variable declaration
>
> Signed-off-by:Kiran Padwal <[email protected]>

Minor nit, you need a ' ' after the ':'.

Also, you sent me two different patches, with the same Subject: line.
So I can't apply either of them, sorry. Please resend both of them with
better subject lines (hint, put the filename in the subject: that would
fix this...)

thanks,

greg k-h

2014-07-17 03:40:50

by Kiran Padwal

Subject: Re: [PATCH] Staging: gdm724x: fix missing blank line after variable declaration

Hi,

On Thu, Jul 17, 2014 at 2:00 AM, Greg KH <[email protected]> wrote:
> On Wed, Jul 16, 2014 at 04:55:23PM +0530, Kiran Padwal wrote:
>> From: Kiran Padwal <[email protected]>
>>
>> Checkpatch fix - Add missing blank line after variable declaration
>>
>> Signed-off-by:Kiran Padwal <[email protected]>
>
> Minor nit, you need a ' ' after the ':'.
>
> Also, you sent me two different patches, with the same Subject: line.
> So I can't apply either of them, sorry. Please resend both of them with
> better subject lines (hint, put the filename in the subject: that would
> fix this...)

Thanks, I will resend it.

>
> thanks,
>
> greg k-h