Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
  bonding: enable netpoll without checking link status
  xfrm: Refcount destination entry on xfrm_lookup
  net: introduce rx_handler results and logic around that
  bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
  bonding: wrap slave state work
  net: get rid of multiple bond-related netdevice->priv_flags
  bonding: register slave pointer for rx_handler
  be2net: Bump up the version number
  be2net: Copyright notice change. Update to Emulex instead of ServerEngines
  e1000e: fix kconfig for crc32 dependency
  netfilter ebtables: fix xt_AUDIT to work with ebtables
  xen network backend driver
  bonding: Improve syslog message at device creation time
  bonding: Call netif_carrier_off after register_netdevice
  bonding: Incorrect TX queue offset
  net_sched: fix ip_tos2prio
  xfrm: fix __xfrm_route_forward()
  be2net: Fix UDP packet detected status in RX compl
  Phonet: fix aligned-mode pipe socket buffer header reserve
  netxen: support for GbE port settings
  ...

Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates.

1 files changed, 6 insertions, 22 deletions

diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
index a53fb25a64e..55b93dc60d0 100644
--- a/net/rxrpc/ar-peer.c
+++ b/net/rxrpc/ar-peer.c
@@ -36,31 +36,15 @@ static void rxrpc_destroy_peer(struct work_struct *work);
 static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer)
 {
         struct rtable *rt;
-        struct flowi fl;
-        int ret;
 
         peer->if_mtu = 1500;
 
-        memset(&fl, 0, sizeof(fl));
-
-        switch (peer->srx.transport.family) {
-        case AF_INET:
-                fl.oif = 0;
-                fl.proto = IPPROTO_UDP,
-                fl.fl4_dst = peer->srx.transport.sin.sin_addr.s_addr;
-                fl.fl4_src = 0;
-                fl.fl4_tos = 0;
-                /* assume AFS.CM talking to AFS.FS */
-                fl.fl_ip_sport = htons(7001);
-                fl.fl_ip_dport = htons(7000);
-                break;
-        default:
-                BUG();
-        }
-
-        ret = ip_route_output_key(&init_net, &rt, &fl);
-        if (ret < 0) {
-                _leave(" [route err %d]", ret);
+        rt = ip_route_output_ports(&init_net, NULL,
+                                   peer->srx.transport.sin.sin_addr.s_addr, 0,
+                                   htons(7000), htons(7001),
+                                   IPPROTO_UDP, 0, 0);
+        if (IS_ERR(rt)) {
+                _leave(" [route err %ld]", PTR_ERR(rt));
                 return;
         }