diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-11 13:47:29 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-08-11 13:47:29 +0200 |
| commit | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (patch) | |
| tree | c353e3ad19017c8f5cdb330d6363ca2845cb11c4 /linux/dev/include | |
| parent | ec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (diff) | |
| parent | e1f856119dae48fcc1b649521ca45e4bdaa80ea9 (diff) | |
Merge branch 'master' into master-gdb_stubs
Conflicts:
i386/i386at/com.c
Diffstat (limited to 'linux/dev/include')
| -rw-r--r-- | linux/dev/include/linux/skbuff.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/linux/dev/include/linux/skbuff.h b/linux/dev/include/linux/skbuff.h index cbaba20a..c55e5297 100644 --- a/linux/dev/include/linux/skbuff.h +++ b/linux/dev/include/linux/skbuff.h @@ -404,10 +404,7 @@ extern __inline__ unsigned char *skb_put(struct sk_buff *skb, int len) skb->len+=len; if(skb->tail>skb->end) { - __label__ here; - panic("skput:over: %p:%d", &&here,len); -here: - ; + panic("skput:over: %d", len); } return tmp; } @@ -418,10 +415,7 @@ extern __inline__ unsigned char *skb_push(struct sk_buff *skb, int len) skb->len+=len; if(skb->data<skb->head) { - __label__ here; - panic("skpush:under: %p:%d", &&here,len); -here: - ; + panic("skpush:under: %d", len); } return skb->data; } |