aboutsummaryrefslogtreecommitdiff
path: root/include/net
AgeCommit message (Collapse)AuthorFilesLines
2011-02-23xfrm: Const'ify address arguments to xfrm_addr_cmp()David S. Miller1-1/+2
Signed-off-by: David S. Miller <[email protected]>
2011-02-23xfrm: Const'ify address arguments to ->dst_lookup()David S. Miller1-2/+2
Signed-off-by: David S. Miller <[email protected]>
2011-02-23xfrm: Const'ify selector argument to xfrm_selector_match()David S. Miller1-1/+1
Signed-off-by: David S. Miller <[email protected]>
2011-02-23xfrm: Const'ify tmpl and address arguments to ->init_temprop()David S. Miller1-2/+4
Signed-off-by: David S. Miller <[email protected]>
2011-02-23xfrm: Pass km_event pointers around as const when possible.David S. Miller1-4/+4
Signed-off-by: David S. Miller <[email protected]>
2011-02-23net_sched: long word align struct qdisc_skb_cb dataEric Dumazet1-1/+1
netem_skb_cb() does : return (struct netem_skb_cb *)qdisc_skb_cb(skb)->data; Unfortunatly struct qdisc_skb_cb data is not long word aligned, so access to psched_time_t time_to_send uses a non aligned access. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-02-23mac80211: rename RX_FLAG_TSFTJohannes Berg1-4/+5
The flag isn't very descriptive -- the intention is that the driver provides a TSF timestamp at the beginning of the MPDU -- make that clearer by renaming the flag to RX_FLAG_MACTIME_MPDU. Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-02-22net: Make flow cache paths use a const struct flowi.David S. Miller2-6/+8
Signed-off-by: David S. Miller <[email protected]>
2011-02-22net: Mark flowi arg to flow_cache_uli_match() const.David S. Miller1-1/+2
Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark flowi arg to xfrm_state_find() const.David S. Miller1-2/+4
Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark flowi arg to xfrm_selector_match() const.David S. Miller1-1/+2
Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark token args to addr_match() const.David S. Miller1-6/+7
Also, make it return a real bool. Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark flowi arg to xfrm_type->reject() const.David S. Miller1-1/+2
Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark flowi arg to ->init_tempsel() const.David S. Miller1-1/+2
Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark flowi arg to ->fill_dst() const.David S. Miller1-1/+1
Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark flowi arg to ->get_tos() const.David S. Miller1-1/+1
Signed-off-by: David S. Miller <[email protected]>
2011-02-22xfrm: Mark flowi arg const in key extraction helpers.David S. Miller1-6/+6
Signed-off-by: David S. Miller <[email protected]>
2011-02-22Merge branch 'master' of ↵John W. Linville6-36/+542
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-02-22net: add __rcu annotations to sk_wq and wqEric Dumazet1-3/+4
Add proper RCU annotations/verbs to sk_wq and wq members Fix __sctp_write_space() sk_sleep() abuse (and sock->wq access) Fix sunrpc sk_sleep() abuse too Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-02-22ipv6: Add IPv6 multicast address flag definesLinus Lüssing1-0/+12
This commit adds the missing IPv6 multicast address flag defines to complement the already existing multicast address scope defines and to be able to check these flags nicely in the future. Signed-off-by: Linus Lüssing <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-02-22ipvs: use hlist instead of listChangli Gao1-1/+1
Signed-off-by: Changli Gao <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2011-02-21Bluetooth: Add mgmt_auth_failed eventJohan Hedberg2-0/+8
To properly track bonding completion an event to indicate authentication failure is needed. This event will be sent whenever an authentication complete HCI event with a non-zero status comes. It will also be sent when we're acting in acceptor role for SSP authentication in which case the controller will send a Simple Pairing Complete event. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-21Bluetooth: Fix mgmt_pin_code_reply return parametersJohan Hedberg1-0/+5
The command complete event for mgmt_pin_code_reply & mgmt_pin_code_neg_reply should have the adapter index, Bluetooth address as well as the status. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-21Bluetooth: Add management support for user confirmation requestJohan Hedberg3-0/+41
This patch adds support for the user confirmation (numeric comparison) Secure Simple Pairing authentication method. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-21Bluetooth: Add mgmt_pair_device commandJohan Hedberg2-0/+28
This patch adds a new mgmt_pair_device which can be used to initiate a dedicated bonding procedure. Some extra callbacks are added to the hci_conn struct so that the pairing code can get notified of the completion of the procedure. Signed-off-by: Johan Hedberg <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-20tcp: Remove debug macro of TCP_CHECK_TIMERShan Wei1-2/+0
Now, TCP_CHECK_TIMER is not used for debuging, it does nothing. And, it has been there for several years, maybe 6 years. Remove it to keep code clearer. Signed-off-by: Shan Wei <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-02-19Merge branch 'master' of ↵David S. Miller1-11/+1
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: Documentation/feature-removal-schedule.txt drivers/net/e1000e/netdev.c net/xfrm/xfrm_policy.c
2011-02-19Merge branch 'master' of ↵David S. Miller1-11/+1
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
2011-02-17ipv4: Use const'ify fib_result deep in the route call chains.David S. Miller1-1/+1
The only troublesome bit here is __mkroute_output which wants to override res->fi and res->type, compute those in local variables instead. Signed-off-by: David S. Miller <[email protected]>
2011-02-17ipv4: Mark fib_combine_itag()'s 'res' arg as const.David S. Miller1-1/+1
Signed-off-by: David S. Miller <[email protected]>
2011-02-17net: Add initial_ref arg to dst_alloc().David S. Miller1-1/+1
This allows avoiding multiple writes to the initial __refcnt. The most simplest cases of wanting an initial reference of "1" in ipv4 and ipv6 have been converted, the rest have been left along and kept at the existing "0". Signed-off-by: David S. Miller <[email protected]>
2011-02-17tty: now phase out the ioctl file pointer for goodAlan Cox1-1/+1
Only oddities here are a couple of drivers that bogusly called the ldisc helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes away. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-02-17tiocmset: kill the file pointer argumentAlan Cox1-1/+1
Doing tiocmget was such fun we should do tiocmset as well for the same reasons Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-02-17tiocmget: kill off the passing of the struct fileAlan Cox1-1/+1
We don't actually need this and it causes problems for internal use of this functionality. Currently there is a single use of the FILE * pointer. That is the serial core which uses it to check tty_hung_up_p. However if that is true then IO_ERROR is also already set so the check may be removed. Signed-off-by: Alan Cox <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-02-17Bluetooth: Fix some code style issues in hci_core.hSzymon Janc1-29/+29
Signed-off-by: Szymon Janc <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-17netfilter: tproxy: do not assign timewait sockets to skb->skFlorian Westphal1-11/+1
Assigning a socket in timewait state to skb->sk can trigger kernel oops, e.g. in nfnetlink_log, which does: if (skb->sk) { read_lock_bh(&skb->sk->sk_callback_lock); if (skb->sk->sk_socket && skb->sk->sk_socket->file) ... in the timewait case, accessing sk->sk_callback_lock and sk->sk_socket is invalid. Either all of these spots will need to add a test for sk->sk_state != TCP_TIME_WAIT, or xt_TPROXY must not assign a timewait socket to skb->sk. This does the latter. If a TW socket is found, assign the tproxy nfmark, but skip the skb->sk assignment, thus mimicking behaviour of a '-m socket .. -j MARK/ACCEPT' re-routing rule. The 'SYN to TW socket' case is left unchanged -- we try to redirect to the listener socket. Cc: Balazs Scheidler <[email protected]> Cc: KOVACS Krisztian <[email protected]> Signed-off-by: Florian Westphal <[email protected]> Signed-off-by: Patrick McHardy <[email protected]>
2011-02-16Bluetooth: Send LE Connection Update CommandClaudio Takahasi2-0/+13
If the new connection update parameter are accepted, the LE master host sends the LE Connection Update Command to its controller informing the new requested parameters. Signed-off-by: Claudio Takahasi <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Use proper timer for hci command timoutVille Tervo2-1/+4
Use proper timer instead of hci command flow control to timeout failed hci commands. Otherwise stack ends up sending commands when flow control is used to block new commands. 2010-09-01 18:29:41.592132 < HCI Command: Remote Name Request (0x01|0x0019) plen 10 bdaddr 00:16:CF:E1:C7:D7 mode 2 clkoffset 0x0000 2010-09-01 18:29:41.592681 > HCI Event: Command Status (0x0f) plen 4 Remote Name Request (0x01|0x0019) status 0x00 ncmd 0 2010-09-01 18:29:51.022033 < HCI Command: Remote Name Request Cancel (0x01|0x001a) plen 6 bdaddr 00:16:CF:E1:C7:D7 Signed-off-by: Ville Tervo <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Add connection parameter update responseClaudio Takahasi1-0/+15
Implements L2CAP Connection Parameter Update Response defined in the Bluetooth Core Specification, Volume 3, Part A, section 4.21. Address the LE Connection Parameter Procedure initiated by the slave. Connection Interval Minimum and Maximum have the same range: 6 to 3200. Time = N * 1.25ms. Minimum shall be less or equal to Maximum. The Slave Latency field shall have a value in the range of 0 to ((connSupervisionTimeout / connIntervalMax) - 1). Latency field shall be less than 500. connSupervisionTimeout = Timeout Multiplier * 10 ms. Multiplier field shall have a value in the range of 10 to 3200. Signed-off-by: Claudio Takahasi <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Add LE signaling commands handlingClaudio Takahasi1-0/+2
This patch splits the L2CAP command handling function in order to have a clear separation between the commands related to BR/EDR and LE. Commands and responses in the LE signaling channel are not being handled yet, command reject is sent to all received requests. Bluetooth Core Specification, Volume 3, Part A, section 4 defines the signaling packets formats and allowed commands/responses over the LE signaling channel. Signed-off-by: Claudio Takahasi <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Add SMP command structuresVille Tervo1-0/+76
Add command structures for security manager protocol. Signed-off-by: Ville Tervo <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Add server socket support for LE connectionVille Tervo1-0/+1
Add support for LE server sockets. Signed-off-by: Ville Tervo <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Add LE connection support to L2CAPVille Tervo1-0/+3
Add basic LE connection support to L2CAP. LE connection can be created by specifying cid in struct sockaddr_l2 Signed-off-by: Ville Tervo <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Use LE buffers for LE trafficVille Tervo1-0/+5
Bluetooth chips may have separate buffers for LE traffic. This patch add support to use LE buffers provided by the chip. Signed-off-by: Ville Tervo <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Add LE connect supportVille Tervo2-4/+23
Bluetooth V4.0 adds support for Low Energy (LE) connections. Specification introduces new set of hci commands to control LE connection. This patch adds logic to create, cancel and disconnect LE connections. Signed-off-by: Ville Tervo <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16Bluetooth: Add low energy commands and eventsVille Tervo1-0/+49
Add needed HCI command and event structs to create LE connections. Signed-off-by: Ville Tervo <[email protected]> Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-16ipvs: make "no destination available" message more informativePatrick Schaaf1-0/+2
When IP_VS schedulers do not find a destination, they output a terse "WLC: no destination available" message through kernel syslog, which I can not only make sense of because syslog puts them in a logfile together with keepalived checker results. This patch makes the output a bit more informative, by telling you which virtual service failed to find a destination. Example output: kernel: [1539214.552233] IPVS: wlc: TCP 192.168.8.30:22 - no destination available kernel: [1539299.674418] IPVS: wlc: FWM 22 0x00000016 - no destination available I have tested the code for IPv4 and FWM services, as you can see from the example; I do not have an IPv6 setup to test the third code path with. To avoid code duplication, I put a new function ip_vs_scheduler_err() into ip_vs_sched.c, and use that from the schedulers instead of calling IP_VS_ERR_RL directly. Signed-off-by: Patrick Schaaf <[email protected]> Signed-off-by: Simon Horman <[email protected]>
2011-02-15Bluetooth: remove l2cap_load() hackGustavo F. Padovan1-2/+0
l2cap_load() was added to trigger l2cap.ko module loading from the RFCOMM and BNEP modules. Now that L2CAP module is gone, we don't need it anymore. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-14Bluetooth: Merge L2CAP and SCO modules into bluetooth.koGustavo F. Padovan1-0/+28
Actually doesn't make sense have these modules built separately. The L2CAP layer is needed by almost all Bluetooth protocols and profiles. There isn't any real use case without having L2CAP loaded. SCO is only essential for Audio transfers, but it is so small that we can have it loaded always in bluetooth.ko without problems. If you really doesn't want it you can disable SCO in the kernel config. Signed-off-by: Gustavo F. Padovan <[email protected]>
2011-02-10inet: Create a mechanism for upward inetpeer propagation into routes.David S. Miller2-0/+2
If we didn't have a routing cache, we would not be able to properly propagate certain kinds of dynamic path attributes, for example PMTU information and redirects. The reason is that if we didn't have a routing cache, then there would be no way to lookup all of the active cached routes hanging off of sockets, tunnels, IPSEC bundles, etc. Consider the case where we created a cached route, but no inetpeer entry existed and also we were not asked to pre-COW the route metrics and therefore did not force the creation a new inetpeer entry. If we later get a PMTU message, or a redirect, and store this information in a new inetpeer entry, there is no way to teach that cached route about the newly existing inetpeer entry. The facilities implemented here handle this problem. First we create a generation ID. When we create a cached route of any kind, we remember the generation ID at the time of attachment. Any time we force-create an inetpeer entry in response to new path information, we bump that generation ID. The dst_ops->check() callback is where the knowledge of this event is propagated. If the global generation ID does not equal the one stored in the cached route, and the cached route has not attached to an inetpeer yet, we look it up and attach if one is found. Now that we've updated the cached route's information, we update the route's generation ID too. This clears the way for implementing PMTU and redirects directly in the inetpeer cache. There is absolutely no need to consult cached route information in order to maintain this information. At this point nothing bumps the inetpeer genids, that comes in the later changes which handle PMTUs and redirects using inetpeers. Signed-off-by: David S. Miller <[email protected]>