lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NET] 8021Q: Fix whitespace errors.

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki
2007-02-09 23:24:25 +09:00
committed by David S. Miller
parent 9afa0949ee
commit 122952fc2d
4 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/8021q/vlan.c
View File

@@ -184,7 +184,7 @@ struct net_device *__find_vlan_dev(struct net_device *real_dev,
struct vlan_group *grp = __vlan_find_group(real_dev->ifindex); struct vlan_group *grp = __vlan_find_group(real_dev->ifindex);
if (grp) if (grp)
return grp->vlan_devices[VID]; return grp->vlan_devices[VID];
return NULL; return NULL;
} }
@@ -269,7 +269,7 @@ static int unregister_vlan_dev(struct net_device *real_dev,
} }
} }
return ret; return ret;
} }
static int unregister_vlan_device(const char *vlan_IF_name) static int unregister_vlan_device(const char *vlan_IF_name)
@@ -557,8 +557,8 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
grp->vlan_devices[VLAN_ID] = new_dev; grp->vlan_devices[VLAN_ID] = new_dev;
if (vlan_proc_add_dev(new_dev)<0)/* create it's proc entry */ if (vlan_proc_add_dev(new_dev)<0)/* create it's proc entry */
printk(KERN_WARNING "VLAN: failed to add proc entry for %s\n", printk(KERN_WARNING "VLAN: failed to add proc entry for %s\n",
new_dev->name); new_dev->name);
if (real_dev->features & NETIF_F_HW_VLAN_FILTER) if (real_dev->features & NETIF_F_HW_VLAN_FILTER)
real_dev->vlan_rx_add_vid(real_dev, VLAN_ID); real_dev->vlan_rx_add_vid(real_dev, VLAN_ID);
@@ -755,8 +755,8 @@ static int vlan_ioctl_handler(void __user *arg)
/* TODO: Implement /* TODO: Implement
err = vlan_dev_get_ingress_priority(args); err = vlan_dev_get_ingress_priority(args);
if (copy_to_user((void*)arg, &args, if (copy_to_user((void*)arg, &args,
sizeof(struct vlan_ioctl_args))) { sizeof(struct vlan_ioctl_args))) {
err = -EFAULT; err = -EFAULT;
} }
*/ */
err = -EINVAL; err = -EINVAL;
@@ -765,8 +765,8 @@ static int vlan_ioctl_handler(void __user *arg)
/* TODO: Implement /* TODO: Implement
err = vlan_dev_get_egress_priority(args.device1, &(args.args); err = vlan_dev_get_egress_priority(args.device1, &(args.args);
if (copy_to_user((void*)arg, &args, if (copy_to_user((void*)arg, &args,
sizeof(struct vlan_ioctl_args))) { sizeof(struct vlan_ioctl_args))) {
err = -EFAULT; err = -EFAULT;
} }
*/ */
err = -EINVAL; err = -EINVAL;
@@ -788,7 +788,7 @@ static int vlan_ioctl_handler(void __user *arg)
args.u.VID = vid; args.u.VID = vid;
if (copy_to_user(arg, &args, if (copy_to_user(arg, &args,
sizeof(struct vlan_ioctl_args))) { sizeof(struct vlan_ioctl_args))) {
err = -EFAULT; err = -EFAULT;
} }
break; break;

10
net/8021q/vlan.h
View File

@@ -9,8 +9,8 @@
#define VLAN_ERR KERN_ERR #define VLAN_ERR KERN_ERR
#define VLAN_INF KERN_INFO #define VLAN_INF KERN_INFO
#define VLAN_DBG KERN_ALERT /* change these... to debug, having a hard time #define VLAN_DBG KERN_ALERT /* change these... to debug, having a hard time
* changing the log level at run-time..for some reason. * changing the log level at run-time..for some reason.
*/ */
/* /*
@@ -51,10 +51,10 @@ struct net_device *__find_vlan_dev(struct net_device* real_dev,
/* found in vlan_dev.c */ /* found in vlan_dev.c */
int vlan_dev_rebuild_header(struct sk_buff *skb); int vlan_dev_rebuild_header(struct sk_buff *skb);
int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *ptype, struct net_device *orig_dev); struct packet_type *ptype, struct net_device *orig_dev);
int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, void *daddr, void *saddr, unsigned short type, void *daddr, void *saddr,
unsigned len); unsigned len);
int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev);
int vlan_dev_change_mtu(struct net_device *dev, int new_mtu); int vlan_dev_change_mtu(struct net_device *dev, int new_mtu);

8
net/8021q/vlan_dev.c
View File

@@ -113,7 +113,7 @@ static inline struct sk_buff *vlan_check_reorder_header(struct sk_buff *skb)
* *
*/ */
int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
struct packet_type* ptype, struct net_device *orig_dev) struct packet_type* ptype, struct net_device *orig_dev)
{ {
unsigned char *rawp = NULL; unsigned char *rawp = NULL;
struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data); struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data);
@@ -328,8 +328,8 @@ static inline unsigned short vlan_dev_get_egress_qos_mask(struct net_device* dev
* physical devices. * physical devices.
*/ */
int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev, int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, void *daddr, void *saddr, unsigned short type, void *daddr, void *saddr,
unsigned len) unsigned len)
{ {
struct vlan_hdr *vhdr; struct vlan_hdr *vhdr;
unsigned short veth_TCI = 0; unsigned short veth_TCI = 0;
@@ -700,7 +700,7 @@ int vlan_dev_set_mac_address(struct net_device *dev, void *addr_struct_p)
} }
static inline int vlan_dmi_equals(struct dev_mc_list *dmi1, static inline int vlan_dmi_equals(struct dev_mc_list *dmi1,
struct dev_mc_list *dmi2) struct dev_mc_list *dmi2)
{ {
return ((dmi1->dmi_addrlen == dmi2->dmi_addrlen) && return ((dmi1->dmi_addrlen == dmi2->dmi_addrlen) &&
(memcmp(dmi1->dmi_addr, dmi2->dmi_addr, dmi1->dmi_addrlen) == 0)); (memcmp(dmi1->dmi_addr, dmi2->dmi_addr, dmi1->dmi_addrlen) == 0));