diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-07 23:35:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-07 23:35:40 -0400 |
commit | 0d6c4a2e4641bbc556dd74d3aa158c413a972492 (patch) | |
tree | da944af17682659bb433dc2282dcb48380c14cd1 /include/net | |
parent | 6e06c0e2347ec79d0bd5702b2438fe883f784545 (diff) | |
parent | 1c430a727fa512500a422ffe4712166c550ea06a (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/param.c
drivers/net/wireless/iwlwifi/iwl-agn-rx.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c
drivers/net/wireless/iwlwifi/iwl-trans.h
Resolved the iwlwifi conflict with mainline using 3-way diff posted
by John Linville and Stephen Rothwell. In 'net' we added a bug
fix to make iwlwifi report a more accurate skb->truesize but this
conflicted with RX path changes that happened meanwhile in net-next.
In e1000e a conflict arose in the validation code for settings of
adapter->itr. 'net-next' had more sophisticated logic so that
logic was used.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/bluetooth/hci_core.h | 3 | ||||
-rw-r--r-- | include/net/dst.h | 1 | ||||
-rw-r--r-- | include/net/ip_vs.h | 4 | ||||
-rw-r--r-- | include/net/sock.h | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 6822d2595aff..db1c5df45224 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -314,6 +314,7 @@ struct hci_conn { | |||
314 | 314 | ||
315 | __u8 remote_cap; | 315 | __u8 remote_cap; |
316 | __u8 remote_auth; | 316 | __u8 remote_auth; |
317 | bool flush_key; | ||
317 | 318 | ||
318 | unsigned int sent; | 319 | unsigned int sent; |
319 | 320 | ||
@@ -980,7 +981,7 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable); | |||
980 | int mgmt_connectable(struct hci_dev *hdev, u8 connectable); | 981 | int mgmt_connectable(struct hci_dev *hdev, u8 connectable); |
981 | int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status); | 982 | int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status); |
982 | int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, | 983 | int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key, |
983 | u8 persistent); | 984 | bool persistent); |
984 | int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, | 985 | int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, |
985 | u8 addr_type, u32 flags, u8 *name, u8 name_len, | 986 | u8 addr_type, u32 flags, u8 *name, u8 name_len, |
986 | u8 *dev_class); | 987 | u8 *dev_class); |
diff --git a/include/net/dst.h b/include/net/dst.h index ff4da42fcfc6..bed833d9796a 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -59,6 +59,7 @@ struct dst_entry { | |||
59 | #define DST_NOCACHE 0x0010 | 59 | #define DST_NOCACHE 0x0010 |
60 | #define DST_NOCOUNT 0x0020 | 60 | #define DST_NOCOUNT 0x0020 |
61 | #define DST_NOPEER 0x0040 | 61 | #define DST_NOPEER 0x0040 |
62 | #define DST_FAKE_RTABLE 0x0080 | ||
62 | 63 | ||
63 | short error; | 64 | short error; |
64 | short obsolete; | 65 | short obsolete; |
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 990216ded6b3..93b81aa73429 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -392,7 +392,7 @@ struct ip_vs_protocol { | |||
392 | 392 | ||
393 | void (*exit)(struct ip_vs_protocol *pp); | 393 | void (*exit)(struct ip_vs_protocol *pp); |
394 | 394 | ||
395 | void (*init_netns)(struct net *net, struct ip_vs_proto_data *pd); | 395 | int (*init_netns)(struct net *net, struct ip_vs_proto_data *pd); |
396 | 396 | ||
397 | void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd); | 397 | void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd); |
398 | 398 | ||
@@ -1201,6 +1201,8 @@ ip_vs_lookup_real_service(struct net *net, int af, __u16 protocol, | |||
1201 | 1201 | ||
1202 | extern int ip_vs_use_count_inc(void); | 1202 | extern int ip_vs_use_count_inc(void); |
1203 | extern void ip_vs_use_count_dec(void); | 1203 | extern void ip_vs_use_count_dec(void); |
1204 | extern int ip_vs_register_nl_ioctl(void); | ||
1205 | extern void ip_vs_unregister_nl_ioctl(void); | ||
1204 | extern int ip_vs_control_init(void); | 1206 | extern int ip_vs_control_init(void); |
1205 | extern void ip_vs_control_cleanup(void); | 1207 | extern void ip_vs_control_cleanup(void); |
1206 | extern struct ip_vs_dest * | 1208 | extern struct ip_vs_dest * |
diff --git a/include/net/sock.h b/include/net/sock.h index 68a283425f1c..e613704e9d1c 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1142,9 +1142,9 @@ sk_sockets_allocated_read_positive(struct sock *sk) | |||
1142 | struct proto *prot = sk->sk_prot; | 1142 | struct proto *prot = sk->sk_prot; |
1143 | 1143 | ||
1144 | if (mem_cgroup_sockets_enabled && sk->sk_cgrp) | 1144 | if (mem_cgroup_sockets_enabled && sk->sk_cgrp) |
1145 | return percpu_counter_sum_positive(sk->sk_cgrp->sockets_allocated); | 1145 | return percpu_counter_read_positive(sk->sk_cgrp->sockets_allocated); |
1146 | 1146 | ||
1147 | return percpu_counter_sum_positive(prot->sockets_allocated); | 1147 | return percpu_counter_read_positive(prot->sockets_allocated); |
1148 | } | 1148 | } |
1149 | 1149 | ||
1150 | static inline int | 1150 | static inline int |