diff options
Diffstat (limited to 'net/llc')
-rw-r--r-- | net/llc/af_llc.c | 1 | ||||
-rw-r--r-- | net/llc/llc_proc.c | 3 | ||||
-rw-r--r-- | net/llc/sysctl_net_llc.c | 20 |
3 files changed, 11 insertions, 13 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 5bcc452a247f..56fd85ab358e 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c | |||
@@ -103,7 +103,6 @@ static inline u8 llc_ui_header_len(struct sock *sk, struct sockaddr_llc *addr) | |||
103 | * llc_ui_send_data - send data via reliable llc2 connection | 103 | * llc_ui_send_data - send data via reliable llc2 connection |
104 | * @sk: Connection the socket is using. | 104 | * @sk: Connection the socket is using. |
105 | * @skb: Data the user wishes to send. | 105 | * @skb: Data the user wishes to send. |
106 | * @addr: Source and destination fields provided by the user. | ||
107 | * @noblock: can we block waiting for data? | 106 | * @noblock: can we block waiting for data? |
108 | * | 107 | * |
109 | * Send data via reliable llc2 connection. | 108 | * Send data via reliable llc2 connection. |
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 48212c0a961c..b58bd7c6cdf8 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c | |||
@@ -27,8 +27,7 @@ | |||
27 | 27 | ||
28 | static void llc_ui_format_mac(struct seq_file *seq, u8 *addr) | 28 | static void llc_ui_format_mac(struct seq_file *seq, u8 *addr) |
29 | { | 29 | { |
30 | DECLARE_MAC_BUF(mac); | 30 | seq_printf(seq, "%pM", addr); |
31 | seq_printf(seq, "%s", print_mac(mac, addr)); | ||
32 | } | 31 | } |
33 | 32 | ||
34 | static struct sock *llc_get_sk_idx(loff_t pos) | 33 | static struct sock *llc_get_sk_idx(loff_t pos) |
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c index 5bef1dcf18e3..57b9304d444c 100644 --- a/net/llc/sysctl_net_llc.c +++ b/net/llc/sysctl_net_llc.c | |||
@@ -20,8 +20,8 @@ static struct ctl_table llc2_timeout_table[] = { | |||
20 | .data = &sysctl_llc2_ack_timeout, | 20 | .data = &sysctl_llc2_ack_timeout, |
21 | .maxlen = sizeof(long), | 21 | .maxlen = sizeof(long), |
22 | .mode = 0644, | 22 | .mode = 0644, |
23 | .proc_handler = &proc_dointvec_jiffies, | 23 | .proc_handler = proc_dointvec_jiffies, |
24 | .strategy = &sysctl_jiffies, | 24 | .strategy = sysctl_jiffies, |
25 | }, | 25 | }, |
26 | { | 26 | { |
27 | .ctl_name = NET_LLC2_BUSY_TIMEOUT, | 27 | .ctl_name = NET_LLC2_BUSY_TIMEOUT, |
@@ -29,8 +29,8 @@ static struct ctl_table llc2_timeout_table[] = { | |||
29 | .data = &sysctl_llc2_busy_timeout, | 29 | .data = &sysctl_llc2_busy_timeout, |
30 | .maxlen = sizeof(long), | 30 | .maxlen = sizeof(long), |
31 | .mode = 0644, | 31 | .mode = 0644, |
32 | .proc_handler = &proc_dointvec_jiffies, | 32 | .proc_handler = proc_dointvec_jiffies, |
33 | .strategy = &sysctl_jiffies, | 33 | .strategy = sysctl_jiffies, |
34 | }, | 34 | }, |
35 | { | 35 | { |
36 | .ctl_name = NET_LLC2_P_TIMEOUT, | 36 | .ctl_name = NET_LLC2_P_TIMEOUT, |
@@ -38,8 +38,8 @@ static struct ctl_table llc2_timeout_table[] = { | |||
38 | .data = &sysctl_llc2_p_timeout, | 38 | .data = &sysctl_llc2_p_timeout, |
39 | .maxlen = sizeof(long), | 39 | .maxlen = sizeof(long), |
40 | .mode = 0644, | 40 | .mode = 0644, |
41 | .proc_handler = &proc_dointvec_jiffies, | 41 | .proc_handler = proc_dointvec_jiffies, |
42 | .strategy = &sysctl_jiffies, | 42 | .strategy = sysctl_jiffies, |
43 | }, | 43 | }, |
44 | { | 44 | { |
45 | .ctl_name = NET_LLC2_REJ_TIMEOUT, | 45 | .ctl_name = NET_LLC2_REJ_TIMEOUT, |
@@ -47,8 +47,8 @@ static struct ctl_table llc2_timeout_table[] = { | |||
47 | .data = &sysctl_llc2_rej_timeout, | 47 | .data = &sysctl_llc2_rej_timeout, |
48 | .maxlen = sizeof(long), | 48 | .maxlen = sizeof(long), |
49 | .mode = 0644, | 49 | .mode = 0644, |
50 | .proc_handler = &proc_dointvec_jiffies, | 50 | .proc_handler = proc_dointvec_jiffies, |
51 | .strategy = &sysctl_jiffies, | 51 | .strategy = sysctl_jiffies, |
52 | }, | 52 | }, |
53 | { 0 }, | 53 | { 0 }, |
54 | }; | 54 | }; |
@@ -60,8 +60,8 @@ static struct ctl_table llc_station_table[] = { | |||
60 | .data = &sysctl_llc_station_ack_timeout, | 60 | .data = &sysctl_llc_station_ack_timeout, |
61 | .maxlen = sizeof(long), | 61 | .maxlen = sizeof(long), |
62 | .mode = 0644, | 62 | .mode = 0644, |
63 | .proc_handler = &proc_dointvec_jiffies, | 63 | .proc_handler = proc_dointvec_jiffies, |
64 | .strategy = &sysctl_jiffies, | 64 | .strategy = sysctl_jiffies, |
65 | }, | 65 | }, |
66 | { 0 }, | 66 | { 0 }, |
67 | }; | 67 | }; |