* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits) e1000: fix virtualization bug bonding: fix alb mode locking regression Bluetooth: Fix issue with sysfs handling for connections usbnet: CDC EEM support (v5) tcp: Fix tcp_prequeue() to get correct rto_min value ehea: fix invalid pointer access ne2k-pci: Do not register device until initialized. Subject: [PATCH] br2684: restore net_dev initialization net: Only store high 16 bits of kernel generated filter priorities virtio_net: Fix function name typo virtio_net: Cleanup command queue scatterlist usage bonding: correct the cleanup in bond_create() virtio: add missing include to virtio_net.h smsc95xx: add support for LAN9512 and LAN9514 smsc95xx: configure LED outputs netconsole: take care of NETDEV_UNREGISTER event xt_socket: checks for the state of nf_conntrack bonding: bond_slave_info_query() fix cxgb3: fixing gcc 4.4 compiler warning: suggest parentheses around operand of ‘!’ netfilter: use likely() in xt_info_rdlock_bh() ...
Showing the changes to include/net (2 of 33 files). Show all
Unified · Split
| @@ -457,6 +457,7 @@ int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count); · 456 unmodified lines | |||
| 457 | 457 | ||
| 458 | int hci_register_sysfs(struct hci_dev *hdev); | 458 | int hci_register_sysfs(struct hci_dev *hdev); |
| 459 | void hci_unregister_sysfs(struct hci_dev *hdev); | 459 | void hci_unregister_sysfs(struct hci_dev *hdev); |
| 460 | void hci_conn_init_sysfs(struct hci_conn *conn); | ||
| 460 | void hci_conn_add_sysfs(struct hci_conn *conn); | 461 | void hci_conn_add_sysfs(struct hci_conn *conn); |
| 461 | void hci_conn_del_sysfs(struct hci_conn *conn); | 462 | void hci_conn_del_sysfs(struct hci_conn *conn); |
| 462 | 463 | ||
| @@ -41,6 +41,7 @@ · 40 unmodified lines | |||
| 41 | #include <net/ip.h> | 41 | #include <net/ip.h> |
| 42 | #include <net/tcp_states.h> | 42 | #include <net/tcp_states.h> |
| 43 | #include <net/inet_ecn.h> | 43 | #include <net/inet_ecn.h> |
| 44 | #include <net/dst.h> | ||
| 44 | 45 | ||
| 45 | #include <linux/seq_file.h> | 46 | #include <linux/seq_file.h> |
| 46 | 47 | ||
| @@ -530,6 +531,17 @@ static inline void tcp_fast_path_check(struct sock *sk) · 483 unmodified lines | |||
| 530 | tcp_fast_path_on(tp); | 531 | tcp_fast_path_on(tp); |
| 531 | } | 532 | } |
| 532 | 533 | ||
| 534 | /* Compute the actual rto_min value */ | ||
| 535 | static inline u32 tcp_rto_min(struct sock *sk) | ||
| 536 | { | ||
| 537 | struct dst_entry *dst = __sk_dst_get(sk); | ||
| 538 | u32 rto_min = TCP_RTO_MIN; | ||
| 539 | |||
| 540 | if (dst && dst_metric_locked(dst, RTAX_RTO_MIN)) | ||
| 541 | rto_min = dst_metric_rtt(dst, RTAX_RTO_MIN); | ||
| 542 | return rto_min; | ||
| 543 | } | ||
| 544 | |||
| 533 | /* Compute the actual receive window we are currently advertising. | 545 | /* Compute the actual receive window we are currently advertising. |
| 534 | * Rcv_nxt can be after the window if our peer push more data | 546 | * Rcv_nxt can be after the window if our peer push more data |
| 535 | * than the offered window. | 547 | * than the offered window. |
| @@ -895,7 +907,7 @@ static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb) · 359 unmodified lines | |||
| 895 | wake_up_interruptible(sk->sk_sleep); | 907 | wake_up_interruptible(sk->sk_sleep); |
| 896 | if (!inet_csk_ack_scheduled(sk)) | 908 | if (!inet_csk_ack_scheduled(sk)) |
| 897 | inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK, | 909 | inet_csk_reset_xmit_timer(sk, ICSK_TIME_DACK, |
| 898 | (3 * TCP_RTO_MIN) / 4, | 910 | (3 * tcp_rto_min(sk)) / 4, |
| 899 | TCP_RTO_MAX); | 911 | TCP_RTO_MAX); |
| 900 | } | 912 | } |
| 901 | return 1; | 913 | return 1; |