aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q
diff options
context:
space:
mode:
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan.c6
-rw-r--r--net/8021q/vlan_dev.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index eb1c71ed7dfe..c0c7bb8e9f07 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -470,7 +470,7 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
470 */ 470 */
471 default: 471 default:
472 snprintf(name, IFNAMSIZ, "vlan%.4i", VLAN_ID); 472 snprintf(name, IFNAMSIZ, "vlan%.4i", VLAN_ID);
473 }; 473 }
474 474
475 new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name, 475 new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name,
476 vlan_setup); 476 vlan_setup);
@@ -685,7 +685,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
685 break; 685 break;
686 } 686 }
687 break; 687 break;
688 }; 688 }
689 689
690out: 690out:
691 return NOTIFY_DONE; 691 return NOTIFY_DONE;
@@ -819,7 +819,7 @@ static int vlan_ioctl_handler(void __user *arg)
819 printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n", 819 printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n",
820 __FUNCTION__, args.cmd); 820 __FUNCTION__, args.cmd);
821 return -EINVAL; 821 return -EINVAL;
822 }; 822 }
823out: 823out:
824 return err; 824 return err;
825} 825}
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 7ff6b7948485..ec46084f44b4 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -66,7 +66,7 @@ int vlan_dev_rebuild_header(struct sk_buff *skb)
66 66
67 memcpy(veth->h_source, dev->dev_addr, ETH_ALEN); 67 memcpy(veth->h_source, dev->dev_addr, ETH_ALEN);
68 break; 68 break;
69 }; 69 }
70 70
71 return 0; 71 return 0;
72} 72}
@@ -219,7 +219,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
219 break; 219 break;
220 default: 220 default:
221 break; 221 break;
222 }; 222 }
223 223
224 /* Was a VLAN packet, grab the encapsulated protocol, which the layer 224 /* Was a VLAN packet, grab the encapsulated protocol, which the layer
225 * three protocols care about. 225 * three protocols care about.