Skip to contentSkip to conversation

Move sk_setup_caps out of line

PATCH In review Andi Kleen 2 participants 2 messages Apr 5, 2007 – Apr 21, 2007

Subsystems (3)
Networking Network drivers Sockets
lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 Move sk_setup_caps out of line

It is far too large to be an inline and not in any hot paths.

Signed-off-by Andi Kleen <[email protected]>
include/net/sock.h +1 -13
Index: linux-2.6.21-rc1-net/include/net/sock.h
===================================================================
@@ -1083,19 +1083,7 @@ static inline int sk_can_gso(const struc
 	return net_gso_ok(sk->sk_route_caps, sk->sk_gso_type);
 }
 
-static inline void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
-{
-	__sk_dst_set(sk, dst);
-	sk->sk_route_caps = dst->dev->features;
-	if (sk->sk_route_caps & NETIF_F_GSO)
-		sk->sk_route_caps |= NETIF_F_GSO_MASK;
-	if (sk_can_gso(sk)) {
-		if (dst->header_len)
-			sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
-		else 
-			sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM;
-	}
-}
+extern void sk_setup_caps(struct sock *sk, struct dst_entry *dst);
 
 static inline void sk_charge_skb(struct sock *sk, struct sk_buff *skb)
 {
net/core/sock.c +15 -0
Index: linux-2.6.21-rc1-net/net/core/sock.c
===================================================================
@@ -970,6 +970,21 @@ out:
 
 EXPORT_SYMBOL_GPL(sk_clone);
 
+void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
+{
+	__sk_dst_set(sk, dst);
+	sk->sk_route_caps = dst->dev->features;
+	if (sk->sk_route_caps & NETIF_F_GSO)
+		sk->sk_route_caps |= NETIF_F_GSO_MASK;
+	if (sk_can_gso(sk)) {
+		if (dst->header_len)
+			sk->sk_route_caps &= ~NETIF_F_GSO_MASK;
+		else 
+			sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM;
+	}
+}
+EXPORT_SYMBOL_GPL(sk_setup_caps);
+
 void __init sk_init(void)
 {
 	if (num_physpages <= 4096) {