History

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: appletalk: Fix OOPS in atalk_release(). mlx4: Fixing bad size of event queue buffer mlx4: Fixing use after free bonding:typo in comment sctp: Pass __GFP_NOWARN to hash table allocation attempts. connector: convert to synchronous netlink message processing fib: add rtnl locking in ip_fib_net_exit atm/solos-pci: Don't flap VCs when carrier state changes atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump atm/solos-pci: Use VPI.VCI notation uniformly. Atheros, atl2: Fix mem leaks in error paths of atl2_set_eeprom netdev: fix mtu check when TSO is enabled net/usb: Ethernet quirks for the LG-VL600 4G modem phylib: phy_attach_direct: phy_init_hw can fail, add cleanup bridge: mcast snooping, fix length check of snooped MLDv1/2 via-ircc: Pass PCI device pointer to dma_{alloc, free}_coherent() via-ircc: Use pci_{get, set}_drvdata() instead of static pointer variable net: gre: provide multicast mappings for ipv4 and ipv6 bridge: Fix compilation warning in function br_stp_recalculate_bridge_id() net: Fix warnings caused by MAX_SKB_FRAGS change.

Linus Torvalds committed 15 years ago

Commit 84daeb02 parents ecb78ab c100c8f29 files · +543 −224Browse files

Showing the changes to include (6 of 29 files). Show all

Unified · Split

6 files
  1. include/linux/atmdev.h +1 −0
  2. include/linux/connector.h +3 −13
  3. include/linux/skbuff.h +1 −1
  4. include/linux/usb/usbnet.h +3 −0
  5. include/net/if_inet6.h +16 −0
  6. include/net/ip.h +8 −0
include/linux/atmdev.h+1−0
@@ -443,6 +443,7 @@ void atm_dev_signal_change(struct atm_dev *dev, char signal); · 442 unmodified lines
443 443
444void vcc_insert_socket(struct sock *sk);444void vcc_insert_socket(struct sock *sk);
445 445
446void atm_dev_release_vccs(struct atm_dev *dev);
446 447
447/*448/*
448 * This is approximately the algorithm used by alloc_skb.449 * This is approximately the algorithm used by alloc_skb.
include/linux/connector.h+3−13
@@ -88,8 +88,6 @@ struct cn_queue_dev { · 87 unmodified lines
88 atomic_t refcnt;88 atomic_t refcnt;
89 unsigned char name[CN_CBQ_NAMELEN];89 unsigned char name[CN_CBQ_NAMELEN];
90 90
91 struct workqueue_struct *cn_queue;
92
93 struct list_head queue_list;91 struct list_head queue_list;
94 spinlock_t queue_lock;92 spinlock_t queue_lock;
95 93
@@ -101,20 +99,13 @@ struct cn_callback_id { · 5 unmodified lines
101 struct cb_id id;99 struct cb_id id;
102};100};
103 101
104struct cn_callback_data {
105 struct sk_buff *skb;
106 void (*callback) (struct cn_msg *, struct netlink_skb_parms *);
107
108 void *free;
109};
110
111struct cn_callback_entry {102struct cn_callback_entry {
112 struct list_head callback_entry;103 struct list_head callback_entry;
113 struct work_struct work;104 atomic_t refcnt;
114 struct cn_queue_dev *pdev;105 struct cn_queue_dev *pdev;
115 106
116 struct cn_callback_id id;107 struct cn_callback_id id;
117 struct cn_callback_data data;108 void (*callback) (struct cn_msg *, struct netlink_skb_parms *);
118 109
119 u32 seq, group;110 u32 seq, group;
120};111};
@@ -138,13 +129,12 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, const char *name, · 17 unmodified lines
138 struct cb_id *id,129 struct cb_id *id,
139 void (*callback)(struct cn_msg *, struct netlink_skb_parms *));130 void (*callback)(struct cn_msg *, struct netlink_skb_parms *));
140void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);131void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);
132void cn_queue_release_callback(struct cn_callback_entry *);
141 133
142struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *);134struct cn_queue_dev *cn_queue_alloc_dev(const char *name, struct sock *);
143void cn_queue_free_dev(struct cn_queue_dev *dev);135void cn_queue_free_dev(struct cn_queue_dev *dev);
144 136
145int cn_cb_equal(struct cb_id *, struct cb_id *);137int cn_cb_equal(struct cb_id *, struct cb_id *);
146 138
147void cn_queue_wrapper(struct work_struct *work);
148
149#endif /* __KERNEL__ */139#endif /* __KERNEL__ */
150#endif /* __CONNECTOR_H */140#endif /* __CONNECTOR_H */
include/linux/skbuff.h+1−1
@@ -126,7 +126,7 @@ struct sk_buff; · 125 unmodified lines
126 * GRO uses frags we allocate at least 16 regardless of page size.126 * GRO uses frags we allocate at least 16 regardless of page size.
127 */127 */
128#if (65536/PAGE_SIZE + 2) < 16128#if (65536/PAGE_SIZE + 2) < 16
129#define MAX_SKB_FRAGS 16129#define MAX_SKB_FRAGS 16UL
130#else130#else
131#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2)131#define MAX_SKB_FRAGS (65536/PAGE_SIZE + 2)
132#endif132#endif
include/linux/usb/usbnet.h+3−0
@@ -102,6 +102,7 @@ struct driver_info { · 101 unmodified lines
102 * Affects statistic (counters) and short packet handling.102 * Affects statistic (counters) and short packet handling.
103 */103 */
104#define FLAG_MULTI_PACKET 0x1000104#define FLAG_MULTI_PACKET 0x1000
105#define FLAG_RX_ASSEMBLE 0x2000 /* rx packets may span >1 frames */
105 106
106 /* init device ... can sleep, or cause probe() failure */107 /* init device ... can sleep, or cause probe() failure */
107 int (*bind)(struct usbnet *, struct usb_interface *);108 int (*bind)(struct usbnet *, struct usb_interface *);
@@ -172,7 +173,9 @@ struct cdc_state { · 64 unmodified lines
172};173};
173 174
174extern int usbnet_generic_cdc_bind(struct usbnet *, struct usb_interface *);175extern int usbnet_generic_cdc_bind(struct usbnet *, struct usb_interface *);
176extern int usbnet_cdc_bind(struct usbnet *, struct usb_interface *);
175extern void usbnet_cdc_unbind(struct usbnet *, struct usb_interface *);177extern void usbnet_cdc_unbind(struct usbnet *, struct usb_interface *);
178extern void usbnet_cdc_status(struct usbnet *, struct urb *);
176 179
177/* CDC and RNDIS support the same host-chosen packet filters for IN transfers */180/* CDC and RNDIS support the same host-chosen packet filters for IN transfers */
178#define DEFAULT_FILTER (USB_CDC_PACKET_TYPE_BROADCAST \181#define DEFAULT_FILTER (USB_CDC_PACKET_TYPE_BROADCAST \
include/net/if_inet6.h+16−0
@@ -286,5 +286,21 @@ static inline void ipv6_ib_mc_map(const struct in6_addr *addr, · 285 unmodified lines
286 buf[9] = broadcast[9];286 buf[9] = broadcast[9];
287 memcpy(buf + 10, addr->s6_addr + 6, 10);287 memcpy(buf + 10, addr->s6_addr + 6, 10);
288}288}
289
290static inline int ipv6_ipgre_mc_map(const struct in6_addr *addr,
291 const unsigned char *broadcast, char *buf)
292{
293 if ((broadcast[0] | broadcast[1] | broadcast[2] | broadcast[3]) != 0) {
294 memcpy(buf, broadcast, 4);
295 } else {
296 /* v4mapped? */
297 if ((addr->s6_addr32[0] | addr->s6_addr32[1] |
298 (addr->s6_addr32[2] ^ htonl(0x0000ffff))) != 0)
299 return -EINVAL;
300 memcpy(buf, &addr->s6_addr32[3], 4);
301 }
302 return 0;
303}
304
289#endif305#endif
290#endif306#endif
include/net/ip.h+8−0
@@ -339,6 +339,14 @@ static inline void ip_ib_mc_map(__be32 naddr, const unsigned char *broadcast, ch · 338 unmodified lines
339 buf[16] = addr & 0x0f;339 buf[16] = addr & 0x0f;
340}340}
341 341
342static inline void ip_ipgre_mc_map(__be32 naddr, const unsigned char *broadcast, char *buf)
343{
344 if ((broadcast[0] | broadcast[1] | broadcast[2] | broadcast[3]) != 0)
345 memcpy(buf, broadcast, 4);
346 else
347 memcpy(buf, &naddr, sizeof(naddr));
348}
349
342#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)350#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
343#include <linux/ipv6.h>351#include <linux/ipv6.h>
344#endif352#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t