diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-03-02 03:27:45 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-03-02 03:27:45 -0800 |
| commit | 10f44c023ef22c8c125d5ef15bed560d46c66af9 (patch) | |
| tree | 36d966bce3d8295775fa02ac7c2141e66a38c118 /include/linux | |
| parent | 5ad6b7ada85fa414a7e94c309ef9c73862c08f69 (diff) | |
| parent | 961c380cef0f1af06c254488d1a672324ec2b34a (diff) | |
Merge kroah.com:/home/linux/BK/bleed-2.6
into kroah.com:/home/linux/BK/pci-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/console.h | 2 | ||||
| -rw-r--r-- | include/linux/fb.h | 1 | ||||
| -rw-r--r-- | include/linux/netfilter_bridge.h | 14 | ||||
| -rw-r--r-- | include/linux/vt_kern.h | 3 |
4 files changed, 18 insertions, 2 deletions
diff --git a/include/linux/console.h b/include/linux/console.h index f6ff116ccfb3..2092454b2d8f 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -37,7 +37,7 @@ struct consw { int (*con_scroll)(struct vc_data *, int, int, int, int); void (*con_bmove)(struct vc_data *, int, int, int, int, int, int); int (*con_switch)(struct vc_data *); - int (*con_blank)(struct vc_data *, int); + int (*con_blank)(struct vc_data *, int, int); int (*con_font_op)(struct vc_data *, struct console_font_op *); int (*con_resize)(struct vc_data *, unsigned int, unsigned int); int (*con_set_palette)(struct vc_data *, unsigned char *); diff --git a/include/linux/fb.h b/include/linux/fb.h index 91972971f387..85176893dbf4 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -152,6 +152,7 @@ struct fb_bitfield { #define FB_ACTIVATE_VBL 16 /* activate values on next vbl */ #define FB_CHANGE_CMAP_VBL 32 /* change colormap on vbl */ #define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */ +#define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/ #define FB_ACCELF_TEXT 1 /* text mode acceleration */ diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index bc4f5988251c..de4d397865ce 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h @@ -88,6 +88,20 @@ void nf_bridge_save_header(struct sk_buff *skb) memcpy(skb->nf_bridge->data, skb->data - header_size, header_size); } +/* This is called by the IP fragmenting code and it ensures there is + * enough room for the encapsulating header (if there is one). */ +static inline +int nf_bridge_pad(struct sk_buff *skb) +{ + if (skb->protocol == __constant_htons(ETH_P_IP)) + return 0; + if (skb->nf_bridge) { + if (skb->protocol == __constant_htons(ETH_P_8021Q)) + return 4; + } + return 0; +} + struct bridge_skb_cb { union { __u32 ipv4; diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index f5605e04656f..d1f3c979ce14 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h @@ -44,7 +44,8 @@ int vc_resize(int currcons, unsigned int cols, unsigned int lines); void vc_disallocate(unsigned int console); void reset_palette(int currcons); void set_palette(int currcons); -void do_blank_screen(int gfx_mode); +void do_blank_screen(int entering_gfx); +void do_unblank_screen(int leaving_gfx); void unblank_screen(void); void poke_blanked_console(void); int con_font_op(int currcons, struct console_font_op *op); |