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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (45 commits)
  [VLAN]: Proc entry is not renamed when vlan device name changes.
  [IPV6]: Fix ICMP relookup error path dst leak
  [ATM] drivers/atm/iphase.c: compilation warning fix
  IPv6: do not create temporary adresses with too short preferred lifetime
  IPv6: only update the lifetime of the relevant temporary address
  bluetooth : __rfcomm_dlc_close lock fix
  bluetooth : use lockdep sub-classes for diffrent bluetooth protocol
  [ROSE/AX25] af_rose: rose_release() fix
  mac80211: correct use_short_preamble handling
  b43: Fix PCMCIA IRQ routing
  b43: Add DMA mapping failure messages
  mac80211: trigger ieee80211_sta_work after opening interface
  [LLC]: skb allocation size for responses
  [IP] UDP: Use SEQ_START_TOKEN.
  [NET]: Remove Documentation/networking/sk98lin.txt
  [ATM] atm/idt77252.c: Make 2 functions static
  [ATM]: Make atm/he.c:read_prom_byte() static
  [IPV6] MCAST: Ensure to check multicast listener(s).
  [LLC]: Kill llc_station_mac_sa symbol export.
  forcedeth: fix locking bug with netconsole
  ...

1 files changed, 24 insertions, 3 deletions

diff --git a/net/llc/llc_sap.c b/net/llc/llc_sap.c
index 2525165e2e8f..e2ddde755019 100644
--- a/net/llc/llc_sap.c
+++ b/net/llc/llc_sap.c
@@ -24,20 +24,41 @@
 #include <net/tcp_states.h>
 #include <linux/llc.h>
 
+static int llc_mac_header_len(unsigned short devtype)
+{
+        switch (devtype) {
+        case ARPHRD_ETHER:
+        case ARPHRD_LOOPBACK:
+                return sizeof(struct ethhdr);
+#ifdef CONFIG_TR
+        case ARPHRD_IEEE802_TR:
+                return sizeof(struct trh_hdr);
+#endif
+        }
+        return 0;
+}
+
 /**
  *      llc_alloc_frame - allocates sk_buff for frame
  *      @dev: network device this skb will be sent over
+ *      @type: pdu type to allocate
+ *      @data_size: data size to allocate
  *
  *      Allocates an sk_buff for frame and initializes sk_buff fields.
  *      Returns allocated skb or %NULL when out of memory.
  */
-struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev)
+struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev,
+                                u8 type, u32 data_size)
 {
-        struct sk_buff *skb = alloc_skb(128, GFP_ATOMIC);
+        int hlen = type == LLC_PDU_TYPE_U ? 3 : 4;
+        struct sk_buff *skb;
+
+        hlen += llc_mac_header_len(dev->type);
+        skb = alloc_skb(hlen + data_size, GFP_ATOMIC);
 
         if (skb) {
                 skb_reset_mac_header(skb);
-                skb_reserve(skb, 50);
+                skb_reserve(skb, hlen);
                 skb_reset_network_header(skb);
                 skb_reset_transport_header(skb);
                 skb->protocol = htons(ETH_P_802_2);