diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 04:06:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 04:06:47 +0300 |
| commit | 45ed344cc7b6456856b4ae5e3d81cdb18b98f8ad (patch) | |
| tree | ba64db58e1d4d1fb67b3b666279ebb8e4f7fb42a /net/atm/lec.c | |
| parent | 99535ac2d4d95dbcad6b8d8a04ea57a891fb533b (diff) | |
| parent | bb7e8c5a55c1f5d4192f4b61a84a791796ebf0c3 (diff) | |
| download | linux-45ed344cc7b6456856b4ae5e3d81cdb18b98f8ad.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/atm/lec.c')
| -rw-r--r-- | net/atm/lec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index eea051338498..93ce390996c7 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -1811,8 +1811,7 @@ make_entry(struct lec_priv *priv, unsigned char *mac_addr) { struct lec_arp_table *to_return; - to_return = (struct lec_arp_table *) kmalloc(sizeof(struct lec_arp_table), - GFP_ATOMIC); + to_return = kmalloc(sizeof(struct lec_arp_table), GFP_ATOMIC); if (!to_return) { printk("LEC: Arp entry kmalloc failed\n"); return NULL; |