Browse Source

net: Remove unnecessary semicolons after switch statements

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>
master
Joe Perches 12 years ago committed by David S. Miller
parent
commit
ccbd6a5a4f
  1. 2
      net/8021q/vlan_core.c
  2. 4
      net/core/ethtool.c
  3. 2
      net/ipv4/tcp.c
  4. 5
      net/ipv4/tcp_input.c
  5. 2
      net/rds/tcp_connect.c
  6. 2
      net/socket.c
  7. 6
      net/xfrm/xfrm_hash.h

2
net/8021q/vlan_core.c

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

4
net/core/ethtool.c

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

2
net/ipv4/tcp.c

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

5
net/ipv4/tcp_input.c

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

2
net/rds/tcp_connect.c

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

2
net/socket.c

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

6
net/xfrm/xfrm_hash.h

@ -55,7 +55,7 @@ static inline unsigned __xfrm_src_hash(xfrm_address_t *daddr,
case AF_INET6:
h ^= __xfrm6_daddr_saddr_hash(daddr, saddr);
break;
};
}
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);
break;
};
}
h ^= (h >> 16);
return h & hmask;
}
@ -119,7 +119,7 @@ static inline unsigned int __addr_hash(xfrm_address_t *daddr, xfrm_address_t *sa
case AF_INET6:
h = __xfrm6_daddr_saddr_hash(daddr, saddr);
break;
};
}
h ^= (h >> 16);
return h & hmask;
}

Loading…
Cancel
Save