Commit ab59859d authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller

net: fix returning void-valued expression warnings

drivers/net/8390.c:37:2: warning: returning void-valued expression
drivers/net/bnx2.c:1635:3: warning: returning void-valued expression
drivers/net/xen-netfront.c:1806:2: warning: returning void-valued expression
net/ipv4/tcp_hybla.c:105:3: warning: returning void-valued expression
net/ipv4/tcp_vegas.c:171:3: warning: returning void-valued expression
net/ipv4/tcp_veno.c:123:3: warning: returning void-valued expression
net/sysctl_net.c:85:2: warning: returning void-valued expression
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c2a3b233
......@@ -34,7 +34,7 @@ struct net_device *__alloc_ei_netdev(int size)
void NS8390_init(struct net_device *dev, int startp)
{
return __NS8390_init(dev, startp);
__NS8390_init(dev, startp);
}
EXPORT_SYMBOL(ei_open);
......
......@@ -1631,8 +1631,10 @@ bnx2_set_default_remote_link(struct bnx2 *bp)
static void
bnx2_set_default_link(struct bnx2 *bp)
{
if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP)
return bnx2_set_default_remote_link(bp);
if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP) {
bnx2_set_default_remote_link(bp);
return;
}
bp->autoneg = AUTONEG_SPEED | AUTONEG_FLOW_CTRL;
bp->req_line_speed = 0;
......
......@@ -1803,7 +1803,7 @@ static void __exit netif_exit(void)
if (is_initial_xendomain())
return;
return xenbus_unregister_driver(&netfront);
xenbus_unregister_driver(&netfront);
}
module_exit(netif_exit);
......
......@@ -101,8 +101,10 @@ static void hybla_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
if (!tcp_is_cwnd_limited(sk, in_flight))
return;
if (!ca->hybla_en)
return tcp_reno_cong_avoid(sk, ack, in_flight);
if (!ca->hybla_en) {
tcp_reno_cong_avoid(sk, ack, in_flight);
return;
}
if (ca->rho == 0)
hybla_recalc_param(sk);
......
......@@ -167,8 +167,10 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
struct tcp_sock *tp = tcp_sk(sk);
struct vegas *vegas = inet_csk_ca(sk);
if (!vegas->doing_vegas_now)
return tcp_reno_cong_avoid(sk, ack, in_flight);
if (!vegas->doing_vegas_now) {
tcp_reno_cong_avoid(sk, ack, in_flight);
return;
}
/* The key players are v_beg_snd_una and v_beg_snd_nxt.
*
......
......@@ -119,8 +119,10 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
struct tcp_sock *tp = tcp_sk(sk);
struct veno *veno = inet_csk_ca(sk);
if (!veno->doing_veno_now)
return tcp_reno_cong_avoid(sk, ack, in_flight);
if (!veno->doing_veno_now) {
tcp_reno_cong_avoid(sk, ack, in_flight);
return;
}
/* limited by applications */
if (!tcp_is_cwnd_limited(sk, in_flight))
......
......@@ -82,6 +82,6 @@ EXPORT_SYMBOL_GPL(register_net_sysctl_table);
void unregister_net_sysctl_table(struct ctl_table_header *header)
{
return unregister_sysctl_table(header);
unregister_sysctl_table(header);
}
EXPORT_SYMBOL_GPL(unregister_net_sysctl_table);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment