luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Remove unnecessary semicolons after switch statements

Browse Source 
Also added an explicit break; to avoid
a fallthrough in net/ipv4/tcp_input.c

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-05-14 10:58:26 +00:00 committed by David S. Miller
parent 935e2a26b8
commit ccbd6a5a4f
7 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/8021q/vlan_core.c
View File

@ -61,7 +61,7 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
dev->dev_addr)) dev->dev_addr))
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
break; break;
}; }
return 0; return 0;
} }

4
net/core/ethtool.c
View File

@ -522,7 +522,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr)
p += ETH_GSTRING_LEN; p += ETH_GSTRING_LEN;
num_strings++; num_strings++;
goto unknown_filter; goto unknown_filter;
}; }
/* now the rest of the filters */ /* now the rest of the filters */
switch (fsc->fs.flow_type) { switch (fsc->fs.flow_type) {
@ -646,7 +646,7 @@ static int ethtool_get_rx_ntuple(struct net_device *dev, void __user *useraddr)
p += ETH_GSTRING_LEN; p += ETH_GSTRING_LEN;
num_strings++; num_strings++;
break; break;
}; }
sprintf(p, "\tVLAN: %d, mask: 0x%x\n", sprintf(p, "\tVLAN: %d, mask: 0x%x\n",
fsc->fs.vlan_tag, fsc->fs.vlan_tag_mask); fsc->fs.vlan_tag, fsc->fs.vlan_tag_mask);
p += ETH_GSTRING_LEN; p += ETH_GSTRING_LEN;

2
net/ipv4/tcp.c
View File

@ -2215,7 +2215,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
default: default:
/* fallthru */ /* fallthru */
break; break;
}; }
if (optlen < sizeof(int)) if (optlen < sizeof(int))
return -EINVAL; return -EINVAL;

5
net/ipv4/tcp_input.c
View File

@ -3845,12 +3845,13 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
/* 16-bit multiple */ /* 16-bit multiple */
opt_rx->cookie_plus = opsize; opt_rx->cookie_plus = opsize;
*hvpp = ptr; *hvpp = ptr;
break;
default: default:
/* ignore option */ /* ignore option */
break; break;
}; }
break; break;
}; }
ptr += opsize-2; ptr += opsize-2;
length -= opsize; length -= opsize;

2
net/rds/tcp_connect.c
View File

@ -141,7 +141,7 @@ void rds_tcp_conn_shutdown(struct rds_connection *conn)
release_sock(sock->sk); release_sock(sock->sk);
sock_release(sock); sock_release(sock);
}; }
if (tc->t_tinc) { if (tc->t_tinc) {
rds_inc_put(&tc->t_tinc->ti_inc); rds_inc_put(&tc->t_tinc->ti_inc);

2
net/socket.c
View File

@ -2615,7 +2615,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
return dev_ioctl(net, cmd, uifr); return dev_ioctl(net, cmd, uifr);
default: default:
return -EINVAL; return -EINVAL;
}; }
} }
static int siocdevprivate_ioctl(struct net *net, unsigned int cmd, static int siocdevprivate_ioctl(struct net *net, unsigned int cmd,

6
net/xfrm/xfrm_hash.h
View File

@ -55,7 +55,7 @@ static inline unsigned __xfrm_src_hash(xfrm_address_t *daddr,
case AF_INET6: case AF_INET6:
h ^= __xfrm6_daddr_saddr_hash(daddr, saddr); h ^= __xfrm6_daddr_saddr_hash(daddr, saddr);
break; break;
}; }
return (h ^ (h >> 16)) & hmask; return (h ^ (h >> 16)) & hmask;
} }
@ -102,7 +102,7 @@ static inline unsigned int __sel_hash(struct xfrm_selector *sel, unsigned short
h = __xfrm6_daddr_saddr_hash(daddr, saddr); h = __xfrm6_daddr_saddr_hash(daddr, saddr);
break; break;
}; }
h ^= (h >> 16); h ^= (h >> 16);
return h & hmask; return h & hmask;
} }
@ -119,7 +119,7 @@ static inline unsigned int __addr_hash(xfrm_address_t *daddr, xfrm_address_t *sa
case AF_INET6: case AF_INET6:
h = __xfrm6_daddr_saddr_hash(daddr, saddr); h = __xfrm6_daddr_saddr_hash(daddr, saddr);
break; break;
}; }
h ^= (h >> 16); h ^= (h >> 16);
return h & hmask; return h & hmask;
} }