aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/dev.c2
-rw-r--r--net/core/rtnetlink.c2
-rw-r--r--net/core/sock.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 6357f54c8ff7..38212c3f9971 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2629,7 +2629,7 @@ void __dev_set_rx_mode(struct net_device *dev)
2629 return; 2629 return;
2630 2630
2631 if (!netif_device_present(dev)) 2631 if (!netif_device_present(dev))
2632 return; 2632 return;
2633 2633
2634 if (dev->set_rx_mode) 2634 if (dev->set_rx_mode)
2635 dev->set_rx_mode(dev); 2635 dev->set_rx_mode(dev);
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 864cbdf31ed7..06eccca8cb5d 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -98,7 +98,7 @@ int rtattr_parse(struct rtattr *tb[], int maxattr, struct rtattr *rta, int len)
98} 98}
99 99
100int __rtattr_parse_nested_compat(struct rtattr *tb[], int maxattr, 100int __rtattr_parse_nested_compat(struct rtattr *tb[], int maxattr,
101 struct rtattr *rta, int len) 101 struct rtattr *rta, int len)
102{ 102{
103 if (RTA_PAYLOAD(rta) < len) 103 if (RTA_PAYLOAD(rta) < len)
104 return -1; 104 return -1;
diff --git a/net/core/sock.c b/net/core/sock.c
index 091032a250c7..1d55fbd22dfa 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -217,7 +217,7 @@ static int sock_set_timeout(long *timeo_p, char __user *optval, int optlen)
217 warned++; 217 warned++;
218 printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) " 218 printk(KERN_INFO "sock_set_timeout: `%s' (pid %d) "
219 "tries to set negative timeout\n", 219 "tries to set negative timeout\n",
220 current->comm, current->pid); 220 current->comm, current->pid);
221 return 0; 221 return 0;
222 } 222 }
223 *timeo_p = MAX_SCHEDULE_TIMEOUT; 223 *timeo_p = MAX_SCHEDULE_TIMEOUT;